diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:27:38 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:27:38 -0500 |
| commit | 94b237b6b9d8e2afa304108b9387be67e878f3bc (patch) | |
| tree | 57d6cb6b9094a98b7dd026945b946b4d0c56bcd7 /arch/tile/kernel/sys.c | |
| parent | 2482f8449d712e8049b2b1a3703a5fe50026d6f7 (diff) | |
| parent | 008f17948725c112a3422f72ed57fdc980e146a8 (diff) | |
Merge branch 'arch-tile' into no-rebases
Diffstat (limited to 'arch/tile/kernel/sys.c')
| -rw-r--r-- | arch/tile/kernel/sys.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/tile/kernel/sys.c b/arch/tile/kernel/sys.c index b08095b402d6..02ff5c0ef775 100644 --- a/arch/tile/kernel/sys.c +++ b/arch/tile/kernel/sys.c @@ -106,14 +106,11 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, #define sys_readahead sys32_readahead #endif -/* Call the trampolines to manage pt_regs where necessary. */ -#define sys_execve _sys_execve -#define sys_sigaltstack _sys_sigaltstack +/* Call the assembly trampolines where necessary. */ +#undef sys_rt_sigreturn #define sys_rt_sigreturn _sys_rt_sigreturn +#undef sys_clone #define sys_clone _sys_clone -#ifndef __tilegx__ -#define sys_cmpxchg_badaddr _sys_cmpxchg_badaddr -#endif /* * Note that we can't include <linux/unistd.h> here since the header |