diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 13:51:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 13:51:01 -0400 |
| commit | 571503e10045c89af951962ea0bb783482663aad (patch) | |
| tree | b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a /arch/parisc/include/asm/unistd.h | |
| parent | 29a6ccca3869bbe33879dae0cd7df2a1559eff54 (diff) | |
| parent | 7b21fddd087678a70ad64afc0f632e0f1071b092 (diff) | |
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/parisc/include/asm/unistd.h')
| -rw-r--r-- | arch/parisc/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h index 9cbc2c3bf63..3392de3e7be 100644 --- a/arch/parisc/include/asm/unistd.h +++ b/arch/parisc/include/asm/unistd.h | |||
| @@ -820,8 +820,9 @@ | |||
| 820 | #define __NR_name_to_handle_at (__NR_Linux + 325) | 820 | #define __NR_name_to_handle_at (__NR_Linux + 325) |
| 821 | #define __NR_open_by_handle_at (__NR_Linux + 326) | 821 | #define __NR_open_by_handle_at (__NR_Linux + 326) |
| 822 | #define __NR_syncfs (__NR_Linux + 327) | 822 | #define __NR_syncfs (__NR_Linux + 327) |
| 823 | #define __NR_setns (__NR_Linux + 328) | ||
| 823 | 824 | ||
| 824 | #define __NR_Linux_syscalls (__NR_syncfs + 1) | 825 | #define __NR_Linux_syscalls (__NR_setns + 1) |
| 825 | 826 | ||
| 826 | 827 | ||
| 827 | #define __IGNORE_select /* newselect */ | 828 | #define __IGNORE_select /* newselect */ |