From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 May 2011 17:51:01 +0000 (-0700)
Subject: Merge branch 'setns'
X-Git-Tag: MMI-PSA29.97-13-9~19345
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=571503e10045c89af951962ea0bb783482663aad;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

571503e10045c89af951962ea0bb783482663aad
diff --cc arch/arm/include/asm/unistd.h
index 3de689aa6f68,0c5fc55ad800..2c04ed5efeb5
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@@ -400,7 -400,7 +400,8 @@@
  #define __NR_open_by_handle_at		(__NR_SYSCALL_BASE+371)
  #define __NR_clock_adjtime		(__NR_SYSCALL_BASE+372)
  #define __NR_syncfs			(__NR_SYSCALL_BASE+373)
 -#define __NR_setns			(__NR_SYSCALL_BASE+374)
 +#define __NR_sendmmsg			(__NR_SYSCALL_BASE+374)
++#define __NR_setns			(__NR_SYSCALL_BASE+375)
  
  /*
   * The following SWIs are ARM private.
diff --cc arch/arm/kernel/calls.S
index 24cdac3ce2e3,a05f75928bea..80f7896cc016
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@@ -383,7 -383,7 +383,8 @@@
  		CALL(sys_open_by_handle_at)
  		CALL(sys_clock_adjtime)
  		CALL(sys_syncfs)
 -		CALL(sys_setns)
 +		CALL(sys_sendmmsg)
++/* 375 */	CALL(sys_setns)
  #ifndef syscalls_counted
  .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
  #define syscalls_counted