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/ia64/kernel/entry.S | |
| 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/ia64/kernel/entry.S')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 6de2e23b3636..9ca80193cd4e 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -1775,6 +1775,7 @@ sys_call_table: | |||
| 1775 | data8 sys_open_by_handle_at | 1775 | data8 sys_open_by_handle_at |
| 1776 | data8 sys_clock_adjtime | 1776 | data8 sys_clock_adjtime |
| 1777 | data8 sys_syncfs | 1777 | data8 sys_syncfs |
| 1778 | data8 sys_setns // 1330 | ||
| 1778 | 1779 | ||
| 1779 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 1780 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
| 1780 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ | 1781 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |