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/blackfin/include/asm | |
| 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/blackfin/include/asm')
| -rw-r--r-- | arch/blackfin/include/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/unistd.h b/arch/blackfin/include/asm/unistd.h index ff9a9f35d50b..6ff9c411b145 100644 --- a/arch/blackfin/include/asm/unistd.h +++ b/arch/blackfin/include/asm/unistd.h | |||
| @@ -397,8 +397,9 @@ | |||
| 397 | #define __NR_open_by_handle_at 376 | 397 | #define __NR_open_by_handle_at 376 |
| 398 | #define __NR_clock_adjtime 377 | 398 | #define __NR_clock_adjtime 377 |
| 399 | #define __NR_syncfs 378 | 399 | #define __NR_syncfs 378 |
| 400 | #define __NR_setns 379 | ||
| 400 | 401 | ||
| 401 | #define __NR_syscall 379 | 402 | #define __NR_syscall 380 |
| 402 | #define NR_syscalls __NR_syscall | 403 | #define NR_syscalls __NR_syscall |
| 403 | 404 | ||
| 404 | /* Old optional stuff no one actually uses */ | 405 | /* Old optional stuff no one actually uses */ |