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

@ -820,8 +820,9 @@
#define __NR_name_to_handle_at (__NR_Linux + 325)
#define __NR_open_by_handle_at (__NR_Linux + 326)
#define __NR_syncfs (__NR_Linux + 327)
#define __NR_setns (__NR_Linux + 328)
#define __NR_Linux_syscalls (__NR_syncfs + 1)
#define __NR_Linux_syscalls (__NR_setns + 1)
#define __IGNORE_select /* newselect */

View file

@ -426,6 +426,7 @@
ENTRY_SAME(name_to_handle_at) /* 325 */
ENTRY_COMP(open_by_handle_at)
ENTRY_SAME(syncfs)
ENTRY_SAME(setns)
/* Nothing yet */