Pull signal and vfs compile breakage fixes from Al Viro. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: fixups for signal breakage * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: nommu: fix compilation of nommu.c
Unified · Split
| @@ -300,7 +300,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti) · 299 unmodified lines | ||
| 300 | 300 | if ((sysreg_read(SR) & MODE_MASK) == MODE_SUPERVISOR) |
| 301 | 301 | syscall = 1; |
| 302 | 302 | |
| 303 | − if (ti->flags & _TIF_SIGPENDING)) | |
| 303 | + if (ti->flags & _TIF_SIGPENDING) | |
| 304 | 304 | do_signal(regs, syscall); |
| 305 | 305 | |
| 306 | 306 | if (ti->flags & _TIF_NOTIFY_RESUME) { |
| @@ -31,5 +31,5 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp, · 30 unmodified lines | ||
| 31 | 31 | asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds, |
| 32 | 32 | struct timespec __user *tsp, const sigset_t __user *sigmask, |
| 33 | 33 | size_t sigsetsize); |
| 34 | − | |
| 35 | − | |
| 34 | +asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, | |
| 35 | + size_t sigsetsize); | |
| @@ -493,7 +493,7 @@ static void do_signal(struct pt_regs *regs) · 492 unmodified lines | ||
| 493 | 493 | if (ret) |
| 494 | 494 | return; |
| 495 | 495 | |
| 496 | − signal_delivered(signr, info, ka, regs, 0); | |
| 496 | + signal_delivered(signr, &info, &ka, regs, 0); | |
| 497 | 497 | if (current->ptrace & PT_SINGLESTEP) |
| 498 | 498 | task_pt_regs(current)->icountlevel = 1; |
| 499 | 499 | |
| @@ -1486,7 +1486,7 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len, · 1485 unmodified lines | ||
| 1486 | 1486 | |
| 1487 | 1487 | flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); |
| 1488 | 1488 | |
| 1489 | − ret = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff); | |
| 1489 | + retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff); | |
| 1490 | 1490 | |
| 1491 | 1491 | if (file) |
| 1492 | 1492 | fput(file); |