aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/process.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/kernel/process.c')
-rw-r--r--arch/ia64/kernel/process.c6
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
158void 158void
159do_notify_resume_user (sigset_t *oldset, struct sigscratch *scr, long in_syscall) 159do_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
178static int pal_halt = 1; 178static int pal_halt = 1;