diff options
| author | Tony Luck <tony.luck@intel.com> | 2011-03-23 12:13:47 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-03-23 12:13:47 -0400 |
| commit | 7415982732bcb30100582cff8d2aca12a55123b4 (patch) | |
| tree | 2b1b0e3594cf311282fdd14885bbbdcf7ae83707 /arch/ia64/kernel | |
| parent | 9f6af27fb693c633cc46d36fc1d85efe6d6fbc17 (diff) | |
| parent | 9298168d16faf939141cddc836b6b9b1ef2a8aac (diff) | |
Merge branches 'pstore-fixes' and 'syscalls2' into release
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 244704a174de..6de2e23b3636 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -1771,6 +1771,10 @@ sys_call_table: | |||
| 1771 | data8 sys_fanotify_init | 1771 | data8 sys_fanotify_init |
| 1772 | data8 sys_fanotify_mark | 1772 | data8 sys_fanotify_mark |
| 1773 | data8 sys_prlimit64 // 1325 | 1773 | data8 sys_prlimit64 // 1325 |
| 1774 | data8 sys_name_to_handle_at | ||
| 1775 | data8 sys_open_by_handle_at | ||
| 1776 | data8 sys_clock_adjtime | ||
| 1777 | data8 sys_syncfs | ||
| 1774 | 1778 | ||
| 1775 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 1779 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
| 1776 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ | 1780 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |