diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-01 02:37:23 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-01 02:37:23 -0500 |
commit | 9d5432979951c8761c2b4517007039b9bcc1c110 (patch) | |
tree | 9441cb1cd4a7674a2292936bfb42514f33d24cd4 /include/asm-sh/thread_info.h | |
parent | a913829e90e2af7a6e98f5aadcc9fec4dcf1ef64 (diff) | |
parent | 21e3024cbddb712f6a078bf4132d7682d3c4e35e (diff) | |
download | op-kernel-dev-9d5432979951c8761c2b4517007039b9bcc1c110.zip op-kernel-dev-9d5432979951c8761c2b4517007039b9bcc1c110.tar.gz |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sh/thread_info.h')
-rw-r--r-- | include/asm-sh/thread_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/thread_info.h b/include/asm-sh/thread_info.h index d82f883..4bbbd9f 100644 --- a/include/asm-sh/thread_info.h +++ b/include/asm-sh/thread_info.h @@ -27,7 +27,7 @@ struct thread_info { #endif -#define PREEMPT_ACTIVE 0x4000000 +#define PREEMPT_ACTIVE 0x10000000 /* * macros/functions for gaining access to the thread information structure |