diff options
| author | Richard Weinberger <richard@nod.at> | 2012-05-21 23:25:37 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2012-05-21 23:25:37 +0200 |
| commit | 2ccf62b36097aa88e0ea152d6ef0c0ca2d3884e6 (patch) | |
| tree | bc93e28e0e72fa0cc8c20f64f9e1f3657ad5e479 /arch/um/include/asm/thread_info.h | |
| parent | 875682648b89a3ebc06176d60dc280f810647839 (diff) | |
| parent | ffc51be82b17e1c515fdb2dd5b92605798216b30 (diff) | |
| download | op-kernel-dev-2ccf62b36097aa88e0ea152d6ef0c0ca2d3884e6.zip op-kernel-dev-2ccf62b36097aa88e0ea152d6ef0c0ca2d3884e6.tar.gz | |
Merge branch 'for-um' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal into for-3.5
Diffstat (limited to 'arch/um/include/asm/thread_info.h')
| -rw-r--r-- | arch/um/include/asm/thread_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/asm/thread_info.h index 200c4ab..c04e5ab 100644 --- a/arch/um/include/asm/thread_info.h +++ b/arch/um/include/asm/thread_info.h @@ -71,6 +71,7 @@ static inline struct thread_info *current_thread_info(void) #define TIF_MEMDIE 5 /* is terminating due to OOM killer */ #define TIF_SYSCALL_AUDIT 6 #define TIF_RESTORE_SIGMASK 7 +#define TIF_NOTIFY_RESUME 8 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) @@ -78,6 +79,5 @@ static inline struct thread_info *current_thread_info(void) #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG) #define _TIF_MEMDIE (1 << TIF_MEMDIE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) #endif |
