diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 18:50:11 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 18:50:11 -0800 | 
| commit | 9e2d59ad580d590134285f361a0e80f0e98c0207 (patch) | |
| tree | f3232be75781484193413f32ec82c21f6d8eb76e /arch/mips/kernel/linux32.c | |
| parent | 5ce1a70e2f00f0bce0cab57f798ca354b9496169 (diff) | |
| parent | 235b80226b986dabcbba844968f7807866bd0bfe (diff) | |
| download | olio-linux-3.10-9e2d59ad580d590134285f361a0e80f0e98c0207.tar.xz olio-linux-3.10-9e2d59ad580d590134285f361a0e80f0e98c0207.zip  | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull signal handling cleanups from Al Viro:
 "This is the first pile; another one will come a bit later and will
  contain SYSCALL_DEFINE-related patches.
   - a bunch of signal-related syscalls (both native and compat)
     unified.
   - a bunch of compat syscalls switched to COMPAT_SYSCALL_DEFINE
     (fixing several potential problems with missing argument
     validation, while we are at it)
   - a lot of now-pointless wrappers killed
   - a couple of architectures (cris and hexagon) forgot to save
     altstack settings into sigframe, even though they used the
     (uninitialized) values in sigreturn; fixed.
   - microblaze fixes for delivery of multiple signals arriving at once
   - saner set of helpers for signal delivery introduced, several
     architectures switched to using those."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (143 commits)
  x86: convert to ksignal
  sparc: convert to ksignal
  arm: switch to struct ksignal * passing
  alpha: pass k_sigaction and siginfo_t using ksignal pointer
  burying unused conditionals
  make do_sigaltstack() static
  arm64: switch to generic old sigaction() (compat-only)
  arm64: switch to generic compat rt_sigaction()
  arm64: switch compat to generic old sigsuspend
  arm64: switch to generic compat rt_sigqueueinfo()
  arm64: switch to generic compat rt_sigpending()
  arm64: switch to generic compat rt_sigprocmask()
  arm64: switch to generic sigaltstack
  sparc: switch to generic old sigsuspend
  sparc: COMPAT_SYSCALL_DEFINE does all sign-extension as well as SYSCALL_DEFINE
  sparc: kill sign-extending wrappers for native syscalls
  kill sparc32_open()
  sparc: switch to use of generic old sigaction
  sparc: switch sys_compat_rt_sigaction() to COMPAT_SYSCALL_DEFINE
  mips: switch to generic sys_fork() and sys_clone()
  ...
Diffstat (limited to 'arch/mips/kernel/linux32.c')
| -rw-r--r-- | arch/mips/kernel/linux32.c | 44 | 
1 files changed, 0 insertions, 44 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 7adab86c632..253bd8ad744 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c @@ -119,22 +119,6 @@ SYSCALL_DEFINE6(32_pwrite, unsigned int, fd, const char __user *, buf,  	return sys_pwrite64(fd, buf, count, merge_64(a4, a5));  } -SYSCALL_DEFINE2(32_sched_rr_get_interval, compat_pid_t, pid, -	struct compat_timespec __user *, interval) -{ -	struct timespec t; -	int ret; -	mm_segment_t old_fs = get_fs(); - -	set_fs(KERNEL_DS); -	ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t); -	set_fs(old_fs); -	if (put_user (t.tv_sec, &interval->tv_sec) || -	    __put_user(t.tv_nsec, &interval->tv_nsec)) -		return -EFAULT; -	return ret; -} -  #ifdef CONFIG_SYSVIPC  SYSCALL_DEFINE6(32_ipc, u32, call, long, first, long, second, long, third, @@ -295,27 +279,6 @@ asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_a2,  	                     merge_64(len_a4, len_a5));  } -save_static_function(sys32_clone); -static int noinline __used -_sys32_clone(nabi_no_regargs struct pt_regs regs) -{ -	unsigned long clone_flags; -	unsigned long newsp; -	int __user *parent_tidptr, *child_tidptr; - -	clone_flags = regs.regs[4]; -	newsp = regs.regs[5]; -	if (!newsp) -		newsp = regs.regs[29]; -	parent_tidptr = (int __user *) regs.regs[6]; - -	/* Use __dummy4 instead of getting it off the stack, so that -	   syscall() works.  */ -	child_tidptr = (int __user *) __dummy4; -	return do_fork(clone_flags, newsp, 0, -	               parent_tidptr, child_tidptr); -} -  asmlinkage long sys32_lookup_dcookie(u32 a0, u32 a1, char __user *buf,  	size_t len)  { @@ -328,10 +291,3 @@ SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags,  	return sys_fanotify_mark(fanotify_fd, flags, merge_64(a3, a4),  				 dfd, pathname);  } - -SYSCALL_DEFINE6(32_futex, u32 __user *, uaddr, int, op, u32, val, -		struct compat_timespec __user *, utime, u32 __user *, uaddr2, -		u32, val3) -{ -	return compat_sys_futex(uaddr, op, val, utime, uaddr2, val3); -}  |