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

@ -937,6 +937,7 @@ sys_call_table:
.long sys_inotify_init1
.long sys_preadv
.long sys_pwritev
.long sys_setns /* 335 */
/*
* NOTE!! This doesn't have to be exact - we just have

View file

@ -880,6 +880,7 @@ sys_call_table:
.long sys_inotify_init1
.long sys_preadv
.long sys_pwritev
.long sys_setns /* 335 */
/*
* NOTE!! This doesn't have to be exact - we just have

View file

@ -339,10 +339,11 @@
#define __NR_inotify_init1 332
#define __NR_preadv 333
#define __NR_pwritev 334
#define __NR_setns 335
#ifdef __KERNEL__
#define NR_syscalls 335
#define NR_syscalls 336
#include <arch/unistd.h>