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/h8300 | |
| 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/h8300')
| -rw-r--r-- | arch/h8300/include/asm/unistd.h | 3 | ||||
| -rw-r--r-- | arch/h8300/kernel/syscalls.S | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/h8300/include/asm/unistd.h b/arch/h8300/include/asm/unistd.h index 50f2c5a3659..2c3f8e60b1e 100644 --- a/arch/h8300/include/asm/unistd.h +++ b/arch/h8300/include/asm/unistd.h @@ -325,10 +325,11 @@ #define __NR_move_pages 317 #define __NR_getcpu 318 #define __NR_epoll_pwait 319 +#define __NR_setns 320 #ifdef __KERNEL__ -#define NR_syscalls 320 +#define NR_syscalls 321 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/arch/h8300/kernel/syscalls.S b/arch/h8300/kernel/syscalls.S index faefaff7d43..f4b2e67bcc3 100644 --- a/arch/h8300/kernel/syscalls.S +++ b/arch/h8300/kernel/syscalls.S @@ -333,6 +333,7 @@ SYMBOL_NAME_LABEL(sys_call_table) .long SYMBOL_NAME(sys_ni_syscall) /* sys_move_pages */ .long SYMBOL_NAME(sys_getcpu) .long SYMBOL_NAME(sys_ni_syscall) /* sys_epoll_pwait */ + .long SYMBOL_NAME(sys_setns) /* 320 */ .macro call_sp addr mov.l #SYMBOL_NAME(\addr),er6 |