diff options
author | Linus Torvalds | 2011-05-28 10:51:01 -0700 |
---|---|---|
committer | Linus Torvalds | 2011-05-28 10:51:01 -0700 |
commit | 571503e10045c89af951962ea0bb783482663aad (patch) | |
tree | b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a /arch/alpha | |
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/alpha')
-rw-r--r-- | arch/alpha/include/asm/unistd.h | 3 | ||||
-rw-r--r-- | arch/alpha/kernel/systbls.S | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h index b1834166922d..4ac48a095f3a 100644 --- a/arch/alpha/include/asm/unistd.h +++ b/arch/alpha/include/asm/unistd.h @@ -456,10 +456,11 @@ #define __NR_open_by_handle_at 498 #define __NR_clock_adjtime 499 #define __NR_syncfs 500 +#define __NR_setns 501 #ifdef __KERNEL__ -#define NR_SYSCALLS 501 +#define NR_SYSCALLS 502 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index 15f999d41c75..b9c28f3f1956 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S @@ -519,6 +519,7 @@ sys_call_table: .quad sys_open_by_handle_at .quad sys_clock_adjtime .quad sys_syncfs /* 500 */ + .quad sys_setns .size sys_call_table, . - sys_call_table .type sys_call_table, @object |