| From 3a34c0f4f901d6f4972e1b9158affaff7b813a9a Mon Sep 17 00:00:00 2001 |
| From: David S. Miller <davem@davemloft.net> |
| Date: Mon, 19 Apr 2010 01:30:51 -0700 |
| Subject: sparc64: Fix PREEMPT_ACTIVE value. |
| |
| |
| From: David S. Miller <davem@davemloft.net> |
| |
| [ Upstream commit 6c94b1ee0ca2bfb526d779c088ec20da6a3761db ] |
| |
| It currently overlaps the NMI bit. |
| |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| arch/sparc/include/asm/thread_info_64.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/sparc/include/asm/thread_info_64.h |
| +++ b/arch/sparc/include/asm/thread_info_64.h |
| @@ -121,7 +121,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 |
