summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2010-04-20 05:31:02 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-20 09:17:21 -0700
commit4cecd935f67bf46a9fe8037c710dd86651fcafe4 (patch)
tree6be8f6f6fb2f0a5fa4c3f1227d3485d673103121
parent01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff)
downloadop-kernel-dev-4cecd935f67bf46a9fe8037c710dd86651fcafe4.zip
op-kernel-dev-4cecd935f67bf46a9fe8037c710dd86651fcafe4.tar.gz
x86: correctly wire up the newuname system call
Before commit e28cbf22933d0c0ccaf3c4c27a1a263b41f73859 ("improve sys_newuname() for compat architectures") 64-bit x86 had a private implementation of sys_uname which was just called sys_uname, which other architectures used for the old uname. Due to some merge issues with the uname refactoring patches we ended up calling the old uname version for both the old and new system call slots, which lead to the domainname filed never be set which caused failures with libnss_nis. Reported-and-tested-by: Andy Isaacson <adi@hexapodia.org> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/ia32/ia32entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 59b4556..e790bc1 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -626,7 +626,7 @@ ia32_sys_call_table:
.quad stub32_sigreturn
.quad stub32_clone /* 120 */
.quad sys_setdomainname
- .quad sys_uname
+ .quad sys_newuname
.quad sys_modify_ldt
.quad compat_sys_adjtimex
.quad sys32_mprotect /* 125 */
OpenPOWER on IntegriCloud