diff --git a/[refs] b/[refs] index f71973a8e753..d49bd3296b37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3461034d7d46455060c8476910be22b6b0fc313 +refs/heads/master: affac4bcbba617d7329b04c7882bc49a9826e12f diff --git a/trunk/include/asm-um/thread_info.h b/trunk/include/asm-um/thread_info.h index e4f0198240c5..1feaaf148ef1 100644 --- a/trunk/include/asm-um/thread_info.h +++ b/trunk/include/asm-um/thread_info.h @@ -61,7 +61,7 @@ static inline struct thread_info *current_thread_info(void) #endif -#define PREEMPT_ACTIVE 0x4000000 +#define PREEMPT_ACTIVE 0x10000000 #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ #define TIF_SIGPENDING 1 /* signal pending */