summaryrefslogtreecommitdiff
path: root/arch/mn10300
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-28 10:51:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-28 10:51:01 -0700
commit571503e10045c89af951962ea0bb783482663aad (patch)
treeb24af1e4b5c67e2da940991b8219f8f8c4e7ac0a /arch/mn10300
parent29a6ccca3869bbe33879dae0cd7df2a1559eff54 (diff)
parent7b21fddd087678a70ad64afc0f632e0f1071b092 (diff)
downloadlinux-3.10-571503e10045c89af951962ea0bb783482663aad.tar.gz
linux-3.10-571503e10045c89af951962ea0bb783482663aad.tar.bz2
linux-3.10-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/mn10300')
-rw-r--r--arch/mn10300/include/asm/unistd.h3
-rw-r--r--arch/mn10300/kernel/entry.S1
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h
index 9d056f51592..9051f921cbc 100644
--- a/arch/mn10300/include/asm/unistd.h
+++ b/arch/mn10300/include/asm/unistd.h
@@ -349,10 +349,11 @@
#define __NR_rt_tgsigqueueinfo 336
#define __NR_perf_event_open 337
#define __NR_recvmmsg 338
+#define __NR_setns 339
#ifdef __KERNEL__
-#define NR_syscalls 339
+#define NR_syscalls 340
/*
* specify the deprecated syscalls we want to support on this arch
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S
index fb93ad720b8..ae435e1d566 100644
--- a/arch/mn10300/kernel/entry.S
+++ b/arch/mn10300/kernel/entry.S
@@ -759,6 +759,7 @@ ENTRY(sys_call_table)
.long sys_rt_tgsigqueueinfo
.long sys_perf_event_open
.long sys_recvmmsg
+ .long sys_setns
nr_syscalls=(.-sys_call_table)/4