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/cris/arch-v10 | |
| 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/cris/arch-v10')
| -rw-r--r-- | arch/cris/arch-v10/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S index 0d6420d087fd..1161883eb582 100644 --- a/arch/cris/arch-v10/kernel/entry.S +++ b/arch/cris/arch-v10/kernel/entry.S | |||
| @@ -937,6 +937,7 @@ sys_call_table: | |||
| 937 | .long sys_inotify_init1 | 937 | .long sys_inotify_init1 |
| 938 | .long sys_preadv | 938 | .long sys_preadv |
| 939 | .long sys_pwritev | 939 | .long sys_pwritev |
| 940 | .long sys_setns /* 335 */ | ||
| 940 | 941 | ||
| 941 | /* | 942 | /* |
| 942 | * NOTE!! This doesn't have to be exact - we just have | 943 | * NOTE!! This doesn't have to be exact - we just have |