---

yaml
---
r: 68623
b: refs/heads/master
c: 7379b42
h: refs/heads/master
i:
  68621: d990570
  68619: 03f7817
  68615: 937a663
  68607: 55b50b9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa7744dbb69c06b69c7449063c440d8a53df9e6c
+refs/heads/master: 7379b42b607782695f49d05c80d3eb99e5072908

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: