diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 19:51:01 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 19:51:01 +0200 |
commit | 571503e10045c89af951962ea0bb783482663aad (patch) | |
tree | b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a /arch/m68k/include | |
parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
parent | ns: Wire up the setns system call (diff) | |
download | linux-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/m68k/include')
-rw-r--r-- | arch/m68k/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index f3b649de2a1b..43f984e93970 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h @@ -349,10 +349,11 @@ #define __NR_open_by_handle_at 341 #define __NR_clock_adjtime 342 #define __NR_syncfs 343 +#define __NR_setns 344 #ifdef __KERNEL__ -#define NR_syscalls 344 +#define NR_syscalls 345 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR |