diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
| commit | 58a343f22e8ef987b90e34bbef7f1455e3bb5a15 (patch) | |
| tree | fc811fb570639f2083df6d9191b6a8d7cff65352 /include/asm-i386/thread_info.h | |
| parent | 51c38f9bce274a1e8a90aa457fb433be738f7458 (diff) | |
| parent | 3759fa9c55923f719ae944a3f8fbb029b36f759d (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-i386/thread_info.h')
| -rw-r--r-- | include/asm-i386/thread_info.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h index e20e99551d71..1f7d48c9ba3f 100644 --- a/include/asm-i386/thread_info.h +++ b/include/asm-i386/thread_info.h | |||
| @@ -158,8 +158,8 @@ register unsigned long current_stack_pointer asm("esp") __attribute_used__; | |||
| 158 | 158 | ||
| 159 | /* work to do on interrupt/exception return */ | 159 | /* work to do on interrupt/exception return */ |
| 160 | #define _TIF_WORK_MASK \ | 160 | #define _TIF_WORK_MASK \ |
| 161 | (0x0000FFFF & ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP|\ | 161 | (0x0000FFFF & ~(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ |
| 162 | _TIF_SECCOMP|_TIF_SYSCALL_EMU)) | 162 | _TIF_SECCOMP | _TIF_SYSCALL_EMU)) |
| 163 | /* work to do on any return to u-space */ | 163 | /* work to do on any return to u-space */ |
| 164 | #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) | 164 | #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) |
| 165 | 165 | ||