Commit 99becf13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bf2785a8 03240b27 ad1ed293

arch/avr32/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

arch/xtensa/include/asm/syscall.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

arch/xtensa/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

mm/nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1486,7 +1486,7 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len, 


	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);



	ret = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);

	retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);



	if (file)

		fput(file);