From 765b9279df17fa79fdb01854b629ed6ae7f62759 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 26 Jul 2011 16:50:23 -0400
Subject: [PATCH] --- yaml --- r: 280279 b: refs/heads/master c:
 1bc94226d5c642b78cf6b2e3e843ef24eb740df0 h: refs/heads/master i:   280277:
 8bc36349cbee3fb3e532cb6bedabd7ed6e6de3c6   280275:
 33dca544f28683fb6d69927dbc902c808ecd2bb3   280271:
 3a86012f06a166daebe3848ed8f9287635a2a2c9 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/powerpc/platforms/cell/spu_syscalls.c | 4 ++--
 trunk/include/linux/syscalls.h                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0bc0dd10f262..eb2b690fc2dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df0a42837b86567a130c44515ab620d23e7f182b
+refs/heads/master: 1bc94226d5c642b78cf6b2e3e843ef24eb740df0
diff --git a/trunk/arch/powerpc/platforms/cell/spu_syscalls.c b/trunk/arch/powerpc/platforms/cell/spu_syscalls.c
index 75530d99eda6..714bbfc3162c 100644
--- a/trunk/arch/powerpc/platforms/cell/spu_syscalls.c
+++ b/trunk/arch/powerpc/platforms/cell/spu_syscalls.c
@@ -65,8 +65,8 @@ static inline void spufs_calls_put(struct spufs_calls *calls) { }
 
 #endif /* CONFIG_SPU_FS_MODULE */
 
-asmlinkage long sys_spu_create(const char __user *name,
-		unsigned int flags, mode_t mode, int neighbor_fd)
+SYSCALL_DEFINE4(spu_create, const char __user *, name, unsigned int, flags,
+	umode_t, mode, int, neighbor_fd)
 {
 	long ret;
 	struct file *neighbor;
diff --git a/trunk/include/linux/syscalls.h b/trunk/include/linux/syscalls.h
index d86e5253f84f..b25621476316 100644
--- a/trunk/include/linux/syscalls.h
+++ b/trunk/include/linux/syscalls.h
@@ -753,7 +753,7 @@ asmlinkage long sys_inotify_rm_watch(int fd, __s32 wd);
 asmlinkage long sys_spu_run(int fd, __u32 __user *unpc,
 				 __u32 __user *ustatus);
 asmlinkage long sys_spu_create(const char __user *name,
-		unsigned int flags, mode_t mode, int fd);
+		unsigned int flags, umode_t mode, int fd);
 
 asmlinkage long sys_mknodat(int dfd, const char __user * filename, umode_t mode,
 			    unsigned dev);