lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'setns'

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2011-05-28 10:51:01 -07:00
parent 29a6ccca38 7b21fddd08
commit 571503e100
50 changed files with 87 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/m32r/include/asm/unistd.h
View File

@ -330,10 +330,11 @@
/* #define __NR_timerfd 322 removed */
#define __NR_eventfd 323
#define __NR_fallocate 324
#define __NR_setns 325
#ifdef __KERNEL__
#define NR_syscalls 325
#define NR_syscalls 326
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_STAT64