From 9a813082fc1dee16f6d93ec6340defe21de15e29 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Tue, 9 Oct 2007 20:56:31 -0700
Subject: [PATCH] --- yaml --- r: 68623 b: refs/heads/master c:
 7379b42b607782695f49d05c80d3eb99e5072908 h: refs/heads/master i:   68621:
 d99057021d3fb9c90ffc3f3fbe8827dfead8d96d   68619:
 03f781782aa1e861eb85e0612d2a53129766224c   68615:
 937a663a6281201e8ea0095c8d02f489a3146de0   68607:
 55b50b910eceaa64163a1eade6d44ed3fb21e653 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/sparc64/kernel/sys_sparc.c | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 09c02d29d804..2c4524c70c43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa7744dbb69c06b69c7449063c440d8a53df9e6c
+refs/heads/master: 7379b42b607782695f49d05c80d3eb99e5072908
diff --git a/trunk/arch/sparc64/kernel/sys_sparc.c b/trunk/arch/sparc64/kernel/sys_sparc.c
index d108eeb0734f..0d5c50264945 100644
--- a/trunk/arch/sparc64/kernel/sys_sparc.c
+++ b/trunk/arch/sparc64/kernel/sys_sparc.c
@@ -436,7 +436,7 @@ asmlinkage long sparc_pipe(struct pt_regs *regs)
 asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second,
 			unsigned long third, void __user *ptr, long fifth)
 {
-	int err;
+	long err;
 
 	/* No need for backward compatibility. We can start fresh... */
 	if (call <= SEMCTL) {
@@ -453,16 +453,9 @@ asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second,
 			err = sys_semget(first, (int)second, (int)third);
 			goto out;
 		case SEMCTL: {
-			union semun fourth;
-			err = -EINVAL;
-			if (!ptr)
-				goto out;
-			err = -EFAULT;
-			if (get_user(fourth.__pad,
-				     (void __user * __user *) ptr))
-				goto out;
-			err = sys_semctl(first, (int)second | IPC_64,
-					 (int)third, fourth);
+			err = sys_semctl(first, third,
+					 (int)second | IPC_64,
+					 (union semun) ptr);
 			goto out;
 		}
 		default: