diff options
| author | akpm@linux-foundation.org <akpm@linux-foundation.org> | 2008-04-30 03:53:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:37 -0400 |
| commit | 49eaeb4bc4c901c327ee259c7768be20fd020a30 (patch) | |
| tree | 9f5a3b3dcc2e1d6b9f428a7cf72b8983a9698f15 /include | |
| parent | 02a029b325854a98e76f0a79ab38bec13e66bd38 (diff) | |
signals: ia64 renumber TIF_RESTORE_SIGMASK
TIF_RESTORE_SIGMASK no longer needs to be in the _TIF_WORK_* masks.
Those low bits are scarce. Renumber TIF_RESTORE_SIGMASK to free one up.
Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/thread_info.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h index 6da8069a0f77..f30e05583869 100644 --- a/include/asm-ia64/thread_info.h +++ b/include/asm-ia64/thread_info.h | |||
| @@ -101,7 +101,6 @@ extern void tsk_clear_notify_resume(struct task_struct *tsk); | |||
| 101 | #define TIF_SYSCALL_TRACE 2 /* syscall trace active */ | 101 | #define TIF_SYSCALL_TRACE 2 /* syscall trace active */ |
| 102 | #define TIF_SYSCALL_AUDIT 3 /* syscall auditing active */ | 102 | #define TIF_SYSCALL_AUDIT 3 /* syscall auditing active */ |
| 103 | #define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */ | 103 | #define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */ |
| 104 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ | ||
| 105 | #define TIF_NOTIFY_RESUME 6 /* resumption notification requested */ | 104 | #define TIF_NOTIFY_RESUME 6 /* resumption notification requested */ |
| 106 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 105 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
| 107 | #define TIF_MEMDIE 17 | 106 | #define TIF_MEMDIE 17 |
| @@ -109,6 +108,7 @@ extern void tsk_clear_notify_resume(struct task_struct *tsk); | |||
| 109 | #define TIF_DB_DISABLED 19 /* debug trap disabled for fsyscall */ | 108 | #define TIF_DB_DISABLED 19 /* debug trap disabled for fsyscall */ |
| 110 | #define TIF_FREEZE 20 /* is freezing for suspend */ | 109 | #define TIF_FREEZE 20 /* is freezing for suspend */ |
| 111 | #define TIF_RESTORE_RSE 21 /* user RBS is newer than kernel RBS */ | 110 | #define TIF_RESTORE_RSE 21 /* user RBS is newer than kernel RBS */ |
| 111 | #define TIF_RESTORE_SIGMASK 22 /* restore signal mask in do_signal() */ | ||
| 112 | 112 | ||
| 113 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | 113 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) |
| 114 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) | 114 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) |
| @@ -126,8 +126,7 @@ extern void tsk_clear_notify_resume(struct task_struct *tsk); | |||
| 126 | 126 | ||
| 127 | /* "work to do on user-return" bits */ | 127 | /* "work to do on user-return" bits */ |
| 128 | #define TIF_ALLWORK_MASK (_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SYSCALL_AUDIT|\ | 128 | #define TIF_ALLWORK_MASK (_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SYSCALL_AUDIT|\ |
| 129 | _TIF_NEED_RESCHED| _TIF_SYSCALL_TRACE|\ | 129 | _TIF_NEED_RESCHED|_TIF_SYSCALL_TRACE) |
| 130 | _TIF_RESTORE_SIGMASK) | ||
| 131 | /* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */ | 130 | /* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */ |
| 132 | #define TIF_WORK_MASK (TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT)) | 131 | #define TIF_WORK_MASK (TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT)) |
| 133 | 132 | ||