summaryrefslogtreecommitdiffstats
path: root/arch/h8300/kernel/syscalls.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-28 19:51:01 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-28 19:51:01 +0200
commit571503e10045c89af951962ea0bb783482663aad (patch)
treeb24af1e4b5c67e2da940991b8219f8f8c4e7ac0a /arch/h8300/kernel/syscalls.S
parentMerge git://git.infradead.org/mtd-2.6 (diff)
parentns: Wire up the setns system call (diff)
downloadlinux-571503e10045c89af951962ea0bb783482663aad.tar.xz
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 'arch/h8300/kernel/syscalls.S')
-rw-r--r--arch/h8300/kernel/syscalls.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/h8300/kernel/syscalls.S b/arch/h8300/kernel/syscalls.S
index faefaff7d43d..f4b2e67bcc34 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