diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 10:51:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 10:51:01 -0700 |
| commit | 571503e10045c89af951962ea0bb783482663aad (patch) | |
| tree | b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a /include | |
| parent | 29a6ccca3869bbe33879dae0cd7df2a1559eff54 (diff) | |
| parent | 7b21fddd087678a70ad64afc0f632e0f1071b092 (diff) | |
| download | blackbird-op-linux-571503e10045c89af951962ea0bb783482663aad.tar.gz blackbird-op-linux-571503e10045c89af951962ea0bb783482663aad.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h index 33d524704883..ae90e0f63995 100644 --- a/include/asm-generic/unistd.h +++ b/include/asm-generic/unistd.h @@ -681,9 +681,11 @@ __SC_COMP(__NR_open_by_handle_at, sys_open_by_handle_at, \ __SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime) #define __NR_syncfs 267 __SYSCALL(__NR_syncfs, sys_syncfs) +#define __NR_setns 268 +__SYSCALL(__NR_setns, sys_setns) #undef __NR_syscalls -#define __NR_syscalls 268 +#define __NR_syscalls 269 /* * All syscalls below here should go away really, |
