Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux

[~andy/linux] / arch / m32r / kernel / syscall_table.S

diff --git a/arch/m32r/kernel/syscall_table.S b/arch/m32r/kernel/syscall_table.S
index 60536e271233c20a1401dc7ee09a70e9251f0d48..f365c19795ef52df3da1429fc83fed3237fc09aa 100644 (file)
--- a/arch/m32r/kernel/syscall_table.S
+++ b/arch/m32r/kernel/syscall_table.S
@@ -168,7 +168,7 @@ ENTRY(sys_call_table)
        .long sys_tas                   /* vm86 syscall holder */
        .long sys_ni_syscall            /* query_module syscall holder */
        .long sys_poll
-       .long sys_nfsservctl
+       .long sys_ni_syscall            /* was nfsservctl */
        .long sys_setresgid             /* 170 */
        .long sys_getresgid
        .long sys_prctl
@@ -324,3 +324,4 @@ ENTRY(sys_call_table)
        .long sys_ni_syscall
        .long sys_eventfd
        .long sys_fallocate
+       .long sys_setns                 /* 325 */