Merge branch 'setns'

* setns:
  ns: Wire up the setns system call

Done as a merge to make it easier to fix up conflicts in arm due to
addition of sendmmsg system call

2 files changed, 3 insertions, 1 deletions

diff --git a/arch/blackfin/include/asm/unistd.h b/arch/blackfin/include/asm/unistd.h
index ff9a9f35d50b..6ff9c411b145 100644
--- a/arch/blackfin/include/asm/unistd.h
+++ b/arch/blackfin/include/asm/unistd.h
@@ -397,8 +397,9 @@
 #define __NR_open_by_handle_at  376
 #define __NR_clock_adjtime      377
 #define __NR_syncfs             378
+#define __NR_setns              379
 
-#define __NR_syscall            379
+#define __NR_syscall            380
 #define NR_syscalls             __NR_syscall
 
 /* Old optional stuff no one actually uses */
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index f96933f48a7f..dda11ef06be5 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -1753,6 +1753,7 @@ ENTRY(_sys_call_table)
         .long _sys_open_by_handle_at
         .long _sys_clock_adjtime
         .long _sys_syncfs
+        .long _sys_setns
 
         .rept NR_syscalls-(.-_sys_call_table)/4
         .long _sys_ni_syscall