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/powerpc/include/asm/unistd.h | |
parent | 29a6ccca3869bbe33879dae0cd7df2a1559eff54 (diff) | |
parent | 7b21fddd087678a70ad64afc0f632e0f1071b092 (diff) | |
download | kernel_samsung_smdk4412-571503e10045c89af951962ea0bb783482663aad.zip kernel_samsung_smdk4412-571503e10045c89af951962ea0bb783482663aad.tar.gz kernel_samsung_smdk4412-571503e10045c89af951962ea0bb783482663aad.tar.bz2 |
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/powerpc/include/asm/unistd.h')
-rw-r--r-- | arch/powerpc/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h index 6d23c81..b8b3f59 100644 --- a/arch/powerpc/include/asm/unistd.h +++ b/arch/powerpc/include/asm/unistd.h @@ -372,10 +372,11 @@ #define __NR_clock_adjtime 347 #define __NR_syncfs 348 #define __NR_sendmmsg 349 +#define __NR_setns 350 #ifdef __KERNEL__ -#define __NR_syscalls 350 +#define __NR_syscalls 351 #define __NR__exit __NR_exit #define NR_syscalls __NR_syscalls |