summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
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/arm/include/asm
parent29a6ccca3869bbe33879dae0cd7df2a1559eff54 (diff)
parent7b21fddd087678a70ad64afc0f632e0f1071b092 (diff)
downloadblackbird-op-linux-571503e10045c89af951962ea0bb783482663aad.tar.gz
blackbird-op-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/arm/include/asm')
-rw-r--r--arch/arm/include/asm/unistd.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 3de689aa6f68..2c04ed5efeb5 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -401,6 +401,7 @@
#define __NR_clock_adjtime (__NR_SYSCALL_BASE+372)
#define __NR_syncfs (__NR_SYSCALL_BASE+373)
#define __NR_sendmmsg (__NR_SYSCALL_BASE+374)
+#define __NR_setns (__NR_SYSCALL_BASE+375)
/*
* The following SWIs are ARM private.
OpenPOWER on IntegriCloud