diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/ia32/ia32_signal.c | 12 | ||||
-rw-r--r-- | arch/x86/kernel/signal.c | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c index 0b3f2354f6aa..98bd70faccc5 100644 --- a/arch/x86/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c | |||
@@ -131,18 +131,8 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) | |||
131 | asmlinkage long sys32_sigsuspend(int history0, int history1, old_sigset_t mask) | 131 | asmlinkage long sys32_sigsuspend(int history0, int history1, old_sigset_t mask) |
132 | { | 132 | { |
133 | sigset_t blocked; | 133 | sigset_t blocked; |
134 | |||
135 | current->saved_sigmask = current->blocked; | ||
136 | |||
137 | mask &= _BLOCKABLE; | ||
138 | siginitset(&blocked, mask); | 134 | siginitset(&blocked, mask); |
139 | set_current_blocked(&blocked); | 135 | return sigsuspend(&blocked); |
140 | |||
141 | current->state = TASK_INTERRUPTIBLE; | ||
142 | schedule(); | ||
143 | |||
144 | set_restore_sigmask(); | ||
145 | return -ERESTARTNOHAND; | ||
146 | } | 136 | } |
147 | 137 | ||
148 | asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr, | 138 | asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr, |
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 115eac431483..b68ccadd2ff4 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c | |||
@@ -478,18 +478,8 @@ asmlinkage int | |||
478 | sys_sigsuspend(int history0, int history1, old_sigset_t mask) | 478 | sys_sigsuspend(int history0, int history1, old_sigset_t mask) |
479 | { | 479 | { |
480 | sigset_t blocked; | 480 | sigset_t blocked; |
481 | |||
482 | current->saved_sigmask = current->blocked; | ||
483 | |||
484 | mask &= _BLOCKABLE; | ||
485 | siginitset(&blocked, mask); | 481 | siginitset(&blocked, mask); |
486 | set_current_blocked(&blocked); | 482 | return sigsuspend(&blocked); |
487 | |||
488 | current->state = TASK_INTERRUPTIBLE; | ||
489 | schedule(); | ||
490 | |||
491 | set_restore_sigmask(); | ||
492 | return -ERESTARTNOHAND; | ||
493 | } | 483 | } |
494 | 484 | ||
495 | asmlinkage int | 485 | asmlinkage int |