diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-29 20:56:07 -0800 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-29 20:56:07 -0800 |
commit | 606c0dafbe88102d64c1253caed8a2c36987070f (patch) | |
tree | 23ce7b30341e71c6da8e0183d27e29167e833e26 /include/asm-frv/thread_info.h | |
parent | 6ab16d249513a50bef3f1b275cea6aa8d3f51832 (diff) | |
parent | d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a (diff) | |
download | kernel-crypto-606c0dafbe88102d64c1253caed8a2c36987070f.tar.gz kernel-crypto-606c0dafbe88102d64c1253caed8a2c36987070f.tar.xz kernel-crypto-606c0dafbe88102d64c1253caed8a2c36987070f.zip |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-frv/thread_info.h')
-rw-r--r-- | include/asm-frv/thread_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-frv/thread_info.h b/include/asm-frv/thread_info.h index c8cba7836f0..60f6b2aee76 100644 --- a/include/asm-frv/thread_info.h +++ b/include/asm-frv/thread_info.h @@ -58,7 +58,7 @@ struct thread_info { #endif -#define PREEMPT_ACTIVE 0x4000000 +#define PREEMPT_ACTIVE 0x10000000 /* * macros/functions for gaining access to the thread information structure |