---

yaml --- r: 188894 b: refs/heads/master c: ae6be51 h: refs/heads/master v: v3
git-mirror · Mar 22, 2010 · f2c3d96 · f2c3d96
1 parent f8dd436
commit f2c3d96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b1f513aacee53ed2d20cdf82191c7f486136469
+refs/heads/master: ae6be51ed01d6c4aaf249a207b4434bc7785853b
diff --git a/trunk/include/linux/syscalls.h b/trunk/include/linux/syscalls.h
@@ -688,7 +688,7 @@ asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
 asmlinkage long sys_shmdt(char __user *shmaddr);
 asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf);
-asmlinkage long sys_ipc(unsigned int call, int first, int second,
+asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second,
 		unsigned long third, void __user *ptr, long fifth);
 
 asmlinkage long sys_mq_open(const char __user *name, int oflag, mode_t mode, struct mq_attr __user *attr);