summaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-19 10:30:51 +0200
committerDavid S. Miller <davem@davemloft.net>2010-04-19 10:30:51 +0200
commit6c94b1ee0ca2bfb526d779c088ec20da6a3761db (patch)
treec6b141ac6de8cd761c0267aaa09e111f852f17f0 /arch/sparc
parentsparc64: Run NMIs on the hardirq stack. (diff)
downloadlinux-6c94b1ee0ca2bfb526d779c088ec20da6a3761db.tar.xz
linux-6c94b1ee0ca2bfb526d779c088ec20da6a3761db.zip
sparc64: Fix PREEMPT_ACTIVE value.
It currently overlaps the NMI bit. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/include/asm/thread_info_64.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index 9e2d9447f2ad..4827a3aeac7f 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -111,7 +111,7 @@ struct thread_info {
#define THREAD_SHIFT PAGE_SHIFT
#endif /* PAGE_SHIFT == 13 */
-#define PREEMPT_ACTIVE 0x4000000
+#define PREEMPT_ACTIVE 0x10000000
/*
* macros/functions for gaining access to the thread information structure