Merge branch 'setns'
Linus Torvalds [Sat, 28 May 2011 17:51:01 +0000 (10:51 -0700)]
* 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

1  2 
arch/arm/include/asm/unistd.h
arch/arm/kernel/calls.S

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