diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-25 11:12:05 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-25 11:12:05 +0200 |
commit | 020cfb05f2c594c778537159bd45ea5efb0c5e0d (patch) | |
tree | 1a18e3d4b6930a6f9cd1911a38bdfcee7dc76ac0 | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86... (diff) | |
download | linux-020cfb05f2c594c778537159bd45ea5efb0c5e0d.tar.xz linux-020cfb05f2c594c778537159bd45ea5efb0c5e0d.zip |
[SPARC64]: Fix args to 64-bit sys_semctl() via sys_ipc().
Second and third arguments were swapped for whatever reason.
Reported by Tom Callaway.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc64/kernel/sys_sparc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c index 73ed01ba40dc..8d4761f15fa9 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; } |