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/avr32 | |
| parent | 29a6ccca3869bbe33879dae0cd7df2a1559eff54 (diff) | |
| parent | 7b21fddd087678a70ad64afc0f632e0f1071b092 (diff) | |
| download | linux-stable-571503e10045c89af951962ea0bb783482663aad.tar.gz linux-stable-571503e10045c89af951962ea0bb783482663aad.tar.bz2 linux-stable-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/avr32')
| -rw-r--r-- | arch/avr32/include/asm/unistd.h | 3 | ||||
| -rw-r--r-- | arch/avr32/kernel/syscall_table.S | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/avr32/include/asm/unistd.h b/arch/avr32/include/asm/unistd.h index 89861a27543e..f714544e5560 100644 --- a/arch/avr32/include/asm/unistd.h +++ b/arch/avr32/include/asm/unistd.h @@ -299,9 +299,10 @@ #define __NR_signalfd 279 /* 280 was __NR_timerfd */ #define __NR_eventfd 281 +#define __NR_setns 283 #ifdef __KERNEL__ -#define NR_syscalls 282 +#define NR_syscalls 284 /* Old stuff */ #define __IGNORE_uselib diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S index e76bad16b0f0..c7fd394d28a4 100644 --- a/arch/avr32/kernel/syscall_table.S +++ b/arch/avr32/kernel/syscall_table.S @@ -296,4 +296,5 @@ sys_call_table: .long sys_ni_syscall /* 280, was sys_timerfd */ .long sys_eventfd .long sys_recvmmsg + .long sys_setns .long sys_ni_syscall /* r8 is saturated at nr_syscalls */ |