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
This commit is contained in:
Linus Torvalds 2011-05-28 10:51:01 -07:00
commit 571503e100
50 changed files with 87 additions and 29 deletions

View file

@ -683,8 +683,10 @@ __SYSCALL(305, sys_ni_syscall, 0)
__SYSCALL(306, sys_eventfd, 1)
#define __NR_recvmmsg 307
__SYSCALL(307, sys_recvmmsg, 5)
#define __NR_setns 308
__SYSCALL(308, sys_setns, 2)
#define __NR_syscall_count 308
#define __NR_syscall_count 309
/*
* sysxtensa syscall handler