summaryrefslogtreecommitdiffstats
path: root/ipc/syscall.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-22 20:05:26 -0700
committerDavid S. Miller <davem@davemloft.net>2010-03-22 20:05:26 -0700
commit91c030b4d6445ebe9fbddb86d584441f300df15c (patch)
treee8a48e3ad9e0448c690268175e555fa651983546 /ipc/syscall.c
parent7c3456fdb503071787f7f972de1069b9cacd16f0 (diff)
parentae6be51ed01d6c4aaf249a207b4434bc7785853b (diff)
downloadop-kernel-dev-91c030b4d6445ebe9fbddb86d584441f300df15c.zip
op-kernel-dev-91c030b4d6445ebe9fbddb86d584441f300df15c.tar.gz
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'ipc/syscall.c')
-rw-r--r--ipc/syscall.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/syscall.c b/ipc/syscall.c
index 355a3da..1d6f53f 100644
--- a/ipc/syscall.c
+++ b/ipc/syscall.c
@@ -13,7 +13,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
-SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, int, second,
+SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
unsigned long, third, void __user *, ptr, long, fifth)
{
int version, ret;
OpenPOWER on IntegriCloud