summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-25 02:12:05 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-15 07:50:01 -0700
commited040a11b798aa4302013988cbca99160c5f7bc6 (patch)
treee15b2d4d858198642bde271e02b31cc6f1109d61
parenta5f56179c861a23a2f08409711926ff812f30d38 (diff)
SPARC64: Fix args to 64-bit sys_semctl() via sys_ipc().
[ Upstream commit: 020cfb05f2c594c778537159bd45ea5efb0c5e0d ] Second and third arguments were swapped for whatever reason. Reported by Tom Callaway. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/sparc64/kernel/sys_sparc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index cc3793644a6a..6f771060420e 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -454,8 +454,8 @@ asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second,
err = sys_semget(first, (int)second, (int)third);
goto out;
case SEMCTL: {
- err = sys_semctl(first, third,
- (int)second | IPC_64,
+ err = sys_semctl(first, second,
+ (int)third | IPC_64,
(union semun) ptr);
goto out;
}