Skip to content

Commit 03240b2

Browse files
author
Al Viro
committed
fixups for signal breakage
Obvious brainos spotted by Geert. Signed-off-by: Al Viro <[email protected]>
1 parent 9171c67 commit 03240b2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

arch/avr32/kernel/signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti)
300300
if ((sysreg_read(SR) & MODE_MASK) == MODE_SUPERVISOR)
301301
syscall = 1;
302302

303-
if (ti->flags & _TIF_SIGPENDING))
303+
if (ti->flags & _TIF_SIGPENDING)
304304
do_signal(regs, syscall);
305305

306306
if (ti->flags & _TIF_NOTIFY_RESUME) {

arch/xtensa/include/asm/syscall.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp,
3131
asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,
3232
struct timespec __user *tsp, const sigset_t __user *sigmask,
3333
size_t sigsetsize);
34-
35-
34+
asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset,
35+
size_t sigsetsize);

arch/xtensa/kernel/signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ static void do_signal(struct pt_regs *regs)
493493
if (ret)
494494
return;
495495

496-
signal_delivered(signr, info, ka, regs, 0);
496+
signal_delivered(signr, &info, &ka, regs, 0);
497497
if (current->ptrace & PT_SINGLESTEP)
498498
task_pt_regs(current)->icountlevel = 1;
499499

0 commit comments

Comments
 (0)