|
@@ -268,7 +268,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
|
|
|
badframe:
|
|
|
force_sig(SIGSEGV, current);
|
|
|
return 0;
|
|
|
-}
|
|
|
+}
|
|
|
|
|
|
/*
|
|
|
* Set up a signal frame.
|
|
@@ -489,6 +489,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
|
|
|
if (regs->tra >= 0) {
|
|
|
/* If so, check system call restarting.. */
|
|
|
switch (regs->regs[0]) {
|
|
|
+ case -ERESTART_RESTARTBLOCK:
|
|
|
case -ERESTARTNOHAND:
|
|
|
regs->regs[0] = -EINTR;
|
|
|
break;
|
|
@@ -584,8 +585,8 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
|
|
|
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
|
|
|
if (signr > 0) {
|
|
|
/* Whee! Actually deliver the signal. */
|
|
|
- if (handle_signal(signr, &ka, &info, oldset, regs, save_r0)
|
|
|
- == 0) {
|
|
|
+ if (handle_signal(signr, &ka, &info, oldset,
|
|
|
+ regs, save_r0) == 0) {
|
|
|
/* a signal was successfully delivered; the saved
|
|
|
* sigmask will have been stored in the signal frame,
|
|
|
* and will be restored by sigreturn, so we can simply
|