History

Pull 'for-linus' branches of git://git.kernel.org/pub/scm/linux/kernel/git/viro/{signal,vfs}

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

Linus Torvalds committed 14 years ago

Commit 99becf13 parents bf2785a 03240b2 ad1ed294 files · +5 −5Browse files

Unified · Split

4 files
  1. arch/avr32/kernel/signal.c +1 −1
  2. arch/xtensa/include/asm/syscall.h +2 −2
  3. arch/xtensa/kernel/signal.c +1 −1
  4. mm/nommu.c +1 −1
arch/avr32/kernel/signal.c+1−1
@@ -300,7 +300,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti) · 299 unmodified lines
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+2−2
@@ -31,5 +31,5 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp, · 30 unmodified lines
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+1−1
@@ -493,7 +493,7 @@ static void do_signal(struct pt_regs *regs) · 492 unmodified lines
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
mm/nommu.c+1−1
@@ -1486,7 +1486,7 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len, · 1485 unmodified lines
14861486
14871487 flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
14881488
1489− ret = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);
1489+ retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);
14901490
14911491 if (file)
14921492 fput(file);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t