git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/core-cleanup' into for-linus
[safe/jmp/linux-2.6]
/
arch
/
sparc
/
include
/
asm
/
thread_info_64.h
diff --git
a/arch/sparc/include/asm/thread_info_64.h
b/arch/sparc/include/asm/thread_info_64.h
index
9e2d944
..
4827a3a
100644
(file)
--- 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 0x
4
000000
+#define PREEMPT_ACTIVE 0x
10
000000
/*
* macros/functions for gaining access to the thread information structure