openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2012-06-04 15:09:08 -07:00
parent bf2785a818 03240b279d ad1ed2937e
commit 99becf1328
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/avr32/kernel/signal.c
View File

@ -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) if ((sysreg_read(SR) & MODE_MASK) == MODE_SUPERVISOR)
syscall = 1; syscall = 1;
if (ti->flags & _TIF_SIGPENDING)) if (ti->flags & _TIF_SIGPENDING)
do_signal(regs, syscall); do_signal(regs, syscall);
if (ti->flags & _TIF_NOTIFY_RESUME) { if (ti->flags & _TIF_NOTIFY_RESUME) {

4
arch/xtensa/include/asm/syscall.h
View File

@ -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, asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,
struct timespec __user *tsp, const sigset_t __user *sigmask, struct timespec __user *tsp, const sigset_t __user *sigmask,
size_t sigsetsize); size_t sigsetsize);
asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset,
size_t sigsetsize);

2
arch/xtensa/kernel/signal.c
View File

@ -493,7 +493,7 @@ static void do_signal(struct pt_regs *regs)
if (ret) if (ret)
return; return;
signal_delivered(signr, info, ka, regs, 0); signal_delivered(signr, &info, &ka, regs, 0);
if (current->ptrace & PT_SINGLESTEP) if (current->ptrace & PT_SINGLESTEP)
task_pt_regs(current)->icountlevel = 1; task_pt_regs(current)->icountlevel = 1;

2
mm/nommu.c
View File

@ -1486,7 +1486,7 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); 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) if (file)
fput(file); fput(file);