summaryrefslogtreecommitdiffstats
path: root/include/asm-sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@Linux-SH.ORG>2005-05-28 15:52:01 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-28 16:46:13 -0700
commit37053cc84d51a790a6e5c3987665902cdab122a5 (patch)
tree37076b69c8c1740e015a8227e1f105284ba1b4e6 /include/asm-sh
parentaffac4bcbba617d7329b04c7882bc49a9826e12f (diff)
downloadlinux-37053cc84d51a790a6e5c3987665902cdab122a5.tar.gz
linux-37053cc84d51a790a6e5c3987665902cdab122a5.tar.bz2
linux-37053cc84d51a790a6e5c3987665902cdab122a5.zip
[PATCH] sh: PREEMPT_ACTIVE fix
Port Paulus's ppc64 fix to sh: When the generic IRQ stuff went in, it seems that HARDIRQ_BITS got bumped from 9 (for ppc64) up to 12. Consequently, the PREEMPT_ACTIVE bit is now within HARDIRQ_MASK, and I get in_interrupt() falsely returning true when PREEMPT_ACTIVE is set, and thus a BUG_ON tripping in arch/ppc64/mm/tlb.c. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-sh')
-rw-r--r--include/asm-sh/thread_info.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/thread_info.h b/include/asm-sh/thread_info.h
index d82f883d8e6d..4bbbd9f3c37e 100644
--- a/include/asm-sh/thread_info.h
+++ b/include/asm-sh/thread_info.h
@@ -27,7 +27,7 @@ struct thread_info {
#endif
-#define PREEMPT_ACTIVE 0x4000000
+#define PREEMPT_ACTIVE 0x10000000
/*
* macros/functions for gaining access to the thread information structure