summaryrefslogtreecommitdiffstats
path: root/arch/tile/kernel/sys.c
diff options
context:
space:
mode:
authorChris Metcalf2010-06-07 14:48:13 +0200
committerChris Metcalf2010-06-07 15:29:59 +0200
commit139ef32b0e6b88b00b5e3e74d052d938f178dc9b (patch)
tree0d3af3832ada74f2dae87de971bbd46fcbabf106 /arch/tile/kernel/sys.c
parentMerge branch 'master' into for-linus (diff)
downloadkernel-qcow2-linux-139ef32b0e6b88b00b5e3e74d052d938f178dc9b.tar.gz
kernel-qcow2-linux-139ef32b0e6b88b00b5e3e74d052d938f178dc9b.tar.xz
kernel-qcow2-linux-139ef32b0e6b88b00b5e3e74d052d938f178dc9b.zip
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/sys.c')
-rw-r--r--arch/tile/kernel/sys.c2
1 files changed, 1 insertions, 1 deletions
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,
*/
SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
unsigned long, prot, unsigned long, flags,
- unsigned long, fd, unsigned long, offset)
+ unsigned long, fd, off_t, offset)
{
if (offset & ((1 << PAGE_SHIFT) - 1))
return -EINVAL;