Skip to content

Commit

Permalink
fixups for signal breakage
Browse files Browse the repository at this point in the history
Obvious brainos spotted by Geert.

Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Jun 4, 2012
1 parent 9171c67 commit 03240b2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/avr32/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti)
if ((sysreg_read(SR) & MODE_MASK) == MODE_SUPERVISOR)
syscall = 1;

if (ti->flags & _TIF_SIGPENDING))
if (ti->flags & _TIF_SIGPENDING)
do_signal(regs, syscall);

if (ti->flags & _TIF_NOTIFY_RESUME) {
Expand Down
4 changes: 2 additions & 2 deletions arch/xtensa/include/asm/syscall.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp,
asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,
struct timespec __user *tsp, const sigset_t __user *sigmask,
size_t sigsetsize);


asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset,
size_t sigsetsize);
2 changes: 1 addition & 1 deletion arch/xtensa/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ static void do_signal(struct pt_regs *regs)
if (ret)
return;

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

Expand Down

0 comments on commit 03240b2

Please sign in to comment.