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/cris/include/asm/unistd.h | |
| 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/cris/include/asm/unistd.h')
| -rw-r--r-- | arch/cris/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/cris/include/asm/unistd.h b/arch/cris/include/asm/unistd.h index f6fad83b3a8c..f921b8b0f97e 100644 --- a/arch/cris/include/asm/unistd.h +++ b/arch/cris/include/asm/unistd.h @@ -339,10 +339,11 @@ #define __NR_inotify_init1 332 #define __NR_preadv 333 #define __NR_pwritev 334 +#define __NR_setns 335 #ifdef __KERNEL__ -#define NR_syscalls 335 +#define NR_syscalls 336 #include <arch/unistd.h> |