diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-19 04:30:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-12 18:03:03 -0400 |
| commit | e460d8d05b193b8f51af1220cf60963a53d9c5a9 (patch) | |
| tree | 2e774415ece4267857691908b9a489d0b4f2b270 /arch | |
| parent | cef0d77411b68ff897c9dc8370394baee004bbe2 (diff) | |
sparc64: Fix PREEMPT_ACTIVE value.
[ 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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/asm/thread_info_64.h | 2 |
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 39be9f256e5a..3df02de1984e 100644 --- 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 { | |||
| 121 | #define THREAD_SHIFT PAGE_SHIFT | 121 | #define THREAD_SHIFT PAGE_SHIFT |
| 122 | #endif /* PAGE_SHIFT == 13 */ | 122 | #endif /* PAGE_SHIFT == 13 */ |
| 123 | 123 | ||
| 124 | #define PREEMPT_ACTIVE 0x4000000 | 124 | #define PREEMPT_ACTIVE 0x10000000 |
| 125 | 125 | ||
| 126 | /* | 126 | /* |
| 127 | * macros/functions for gaining access to the thread information structure | 127 | * macros/functions for gaining access to the thread information structure |