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 /arch/x86/include/asm/unistd_64.h | |
parent | 29a6ccca3869bbe33879dae0cd7df2a1559eff54 (diff) | |
parent | 7b21fddd087678a70ad64afc0f632e0f1071b092 (diff) |
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 'arch/x86/include/asm/unistd_64.h')
-rw-r--r-- | arch/x86/include/asm/unistd_64.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h index 79f90eb15aad..705bf139288c 100644 --- a/arch/x86/include/asm/unistd_64.h +++ b/arch/x86/include/asm/unistd_64.h @@ -679,6 +679,8 @@ __SYSCALL(__NR_clock_adjtime, sys_clock_adjtime) __SYSCALL(__NR_syncfs, sys_syncfs) #define __NR_sendmmsg 307 __SYSCALL(__NR_sendmmsg, sys_sendmmsg) +#define __NR_setns 308 +__SYSCALL(__NR_setns, sys_setns) #ifndef __NO_STUBS #define __ARCH_WANT_OLD_READDIR |