diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-07 08:48:13 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-07 09:29:59 -0400 |
| commit | 139ef32b0e6b88b00b5e3e74d052d938f178dc9b (patch) | |
| tree | 0d3af3832ada74f2dae87de971bbd46fcbabf106 /arch/tile/kernel | |
| parent | cc44826a26b12b2489bc7dbb597fcdf107f2cc01 (diff) | |
Revert adding some arch-specific signal syscalls to <linux/syscalls.h>.
It turns out there is some variance on the calling conventions for
these syscalls, and <asm-generic/syscalls.h> is already the mechanism
used to handle this. Switch arch/tile over to using that mechanism and
tweak the calling conventions for a couple of tile syscalls to match
<asm-generic/syscalls.h>.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel')
| -rw-r--r-- | arch/tile/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/tile/kernel/signal.c | 4 | ||||
| -rw-r--r-- | arch/tile/kernel/sys.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c index 824f230e6d1a..c70ff14a48e4 100644 --- a/arch/tile/kernel/process.c +++ b/arch/tile/kernel/process.c | |||
| @@ -502,7 +502,7 @@ int _sys_fork(struct pt_regs *regs) | |||
| 502 | } | 502 | } |
| 503 | 503 | ||
| 504 | int _sys_clone(unsigned long clone_flags, unsigned long newsp, | 504 | int _sys_clone(unsigned long clone_flags, unsigned long newsp, |
| 505 | int __user *parent_tidptr, int __user *child_tidptr, | 505 | void __user *parent_tidptr, void __user *child_tidptr, |
| 506 | struct pt_regs *regs) | 506 | struct pt_regs *regs) |
| 507 | { | 507 | { |
| 508 | if (!newsp) | 508 | if (!newsp) |
diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c index 7ea85eb85242..45835cfad407 100644 --- a/arch/tile/kernel/signal.c +++ b/arch/tile/kernel/signal.c | |||
| @@ -43,8 +43,8 @@ | |||
| 43 | /* Caller before callee in this file; other callee is in assembler */ | 43 | /* Caller before callee in this file; other callee is in assembler */ |
| 44 | void do_signal(struct pt_regs *regs); | 44 | void do_signal(struct pt_regs *regs); |
| 45 | 45 | ||
| 46 | int _sys_sigaltstack(const stack_t __user *uss, | 46 | long _sys_sigaltstack(const stack_t __user *uss, |
| 47 | stack_t __user *uoss, struct pt_regs *regs) | 47 | stack_t __user *uoss, struct pt_regs *regs) |
| 48 | { | 48 | { |
| 49 | return do_sigaltstack(uss, uoss, regs->sp); | 49 | return do_sigaltstack(uss, uoss, regs->sp); |
| 50 | } | 50 | } |
diff --git a/arch/tile/kernel/sys.c b/arch/tile/kernel/sys.c index a3d982b212b4..0427978cea0a 100644 --- a/arch/tile/kernel/sys.c +++ b/arch/tile/kernel/sys.c | |||
| @@ -95,7 +95,7 @@ SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len, | |||
| 95 | */ | 95 | */ |
| 96 | SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, | 96 | SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, |
| 97 | unsigned long, prot, unsigned long, flags, | 97 | unsigned long, prot, unsigned long, flags, |
| 98 | unsigned long, fd, unsigned long, offset) | 98 | unsigned long, fd, off_t, offset) |
| 99 | { | 99 | { |
| 100 | if (offset & ((1 << PAGE_SHIFT) - 1)) | 100 | if (offset & ((1 << PAGE_SHIFT) - 1)) |
| 101 | return -EINVAL; | 101 | return -EINVAL; |
