diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-01 10:49:16 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-01 10:52:54 +0200 |
| commit | e269f90f3d3f7c70cf661c660bf445597261f54a (patch) | |
| tree | f09685517e9efa7d675dad8fd13694157ce50521 /arch/sh/include/asm/syscalls_32.h | |
| parent | drm/i915: simplify sysfs setup code (diff) | |
| parent | radeon: add radeon prime vmap support. (diff) | |
| download | linux-e269f90f3d3f7c70cf661c660bf445597261f54a.tar.xz linux-e269f90f3d3f7c70cf661c660bf445597261f54a.zip | |
Merge remote-tracking branch 'airlied/drm-prime-vmap' into drm-intel-next-queued
We need the latest dma-buf code from Dave Airlie so that we can pimp
the backing storage handling code in drm/i915 with Chris Wilson's
unbound tracking and stolen mem backed gem object code.
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'arch/sh/include/asm/syscalls_32.h')
| -rw-r--r-- | arch/sh/include/asm/syscalls_32.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h index ae717e3c26d6..6c1fa559753c 100644 --- a/arch/sh/include/asm/syscalls_32.h +++ b/arch/sh/include/asm/syscalls_32.h @@ -23,9 +23,7 @@ asmlinkage int sys_execve(const char __user *ufilename, const char __user *const __user *uargv, const char __user *const __user *uenvp, unsigned long r7, struct pt_regs __regs); -asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5, - unsigned long r6, unsigned long r7, - struct pt_regs __regs); +asmlinkage int sys_sigsuspend(old_sigset_t mask); asmlinkage int sys_sigaction(int sig, const struct old_sigaction __user *act, struct old_sigaction __user *oact); asmlinkage int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, |