diff options
| author | Linus Torvalds | 2011-05-28 19:51:01 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-05-28 19:51:01 +0200 |
| commit | 571503e10045c89af951962ea0bb783482663aad (patch) | |
| tree | b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a /arch/frv | |
| parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
| parent | ns: Wire up the setns system call (diff) | |
| download | kernel-qcow2-linux-571503e10045c89af951962ea0bb783482663aad.tar.gz kernel-qcow2-linux-571503e10045c89af951962ea0bb783482663aad.tar.xz kernel-qcow2-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/frv')
| -rw-r--r-- | arch/frv/include/asm/unistd.h | 3 | ||||
| -rw-r--r-- | arch/frv/kernel/entry.S | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h index b28da499e22a..a569dff7cd59 100644 --- a/arch/frv/include/asm/unistd.h +++ b/arch/frv/include/asm/unistd.h @@ -343,10 +343,11 @@ #define __NR_pwritev 334 #define __NR_rt_tgsigqueueinfo 335 #define __NR_perf_event_open 336 +#define __NR_setns 337 #ifdef __KERNEL__ -#define NR_syscalls 337 +#define NR_syscalls 338 #define __ARCH_WANT_IPC_PARSE_VERSION /* #define __ARCH_WANT_OLD_READDIR */ diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index 63d579bf1c29..017d6d7b784f 100644 --- a/arch/frv/kernel/entry.S +++ b/arch/frv/kernel/entry.S @@ -1526,5 +1526,6 @@ sys_call_table: .long sys_pwritev .long sys_rt_tgsigqueueinfo /* 335 */ .long sys_perf_event_open + .long sys_setns syscall_table_size = (. - sys_call_table) |