diff options
author | Alexey Dobriyan <adobriyan@openvz.org> | 2007-01-23 11:03:17 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2007-05-08 17:51:59 -0400 |
commit | 4a177cbf84f827cf9f1d6cfa5264fafd3cc33ce0 (patch) | |
tree | ef04ada4e2b708ee965081cd905026c9156863d3 /arch/ia64/kernel/process.c | |
parent | 690def21414fa43fac1b8053fd952c0366c476de (diff) |
[IA64] Add TIF_RESTORE_SIGMASK
Preparation for pselect and ppoll.
ia32 compat code not tested. :-(
Signed-off-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/process.c')
-rw-r--r-- | arch/ia64/kernel/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index cba6ac398736..d7b7d3da1ebb 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
@@ -156,7 +156,7 @@ show_regs (struct pt_regs *regs) | |||
156 | } | 156 | } |
157 | 157 | ||
158 | void | 158 | void |
159 | do_notify_resume_user (sigset_t *oldset, struct sigscratch *scr, long in_syscall) | 159 | do_notify_resume_user (sigset_t *unused, struct sigscratch *scr, long in_syscall) |
160 | { | 160 | { |
161 | if (fsys_mode(current, &scr->pt)) { | 161 | if (fsys_mode(current, &scr->pt)) { |
162 | /* defer signal-handling etc. until we return to privilege-level 0. */ | 162 | /* defer signal-handling etc. until we return to privilege-level 0. */ |
@@ -171,8 +171,8 @@ do_notify_resume_user (sigset_t *oldset, struct sigscratch *scr, long in_syscall | |||
171 | #endif | 171 | #endif |
172 | 172 | ||
173 | /* deal with pending signal delivery */ | 173 | /* deal with pending signal delivery */ |
174 | if (test_thread_flag(TIF_SIGPENDING)) | 174 | if (test_thread_flag(TIF_SIGPENDING)||test_thread_flag(TIF_RESTORE_SIGMASK)) |
175 | ia64_do_signal(oldset, scr, in_syscall); | 175 | ia64_do_signal(scr, in_syscall); |
176 | } | 176 | } |
177 | 177 | ||
178 | static int pal_halt = 1; | 178 | static int pal_halt = 1; |