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/m32r/kernel | |
| 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/m32r/kernel')
| -rw-r--r-- | arch/m32r/kernel/syscall_table.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/kernel/syscall_table.S b/arch/m32r/kernel/syscall_table.S index 60536e271233..528f2e6ad064 100644 --- a/arch/m32r/kernel/syscall_table.S +++ b/arch/m32r/kernel/syscall_table.S | |||
| @@ -324,3 +324,4 @@ ENTRY(sys_call_table) | |||
| 324 | .long sys_ni_syscall | 324 | .long sys_ni_syscall |
| 325 | .long sys_eventfd | 325 | .long sys_eventfd |
| 326 | .long sys_fallocate | 326 | .long sys_fallocate |
| 327 | .long sys_setns /* 325 */ | ||