diff options
author | Tony Luck | 2011-03-23 09:13:47 -0700 |
---|---|---|
committer | Tony Luck | 2011-03-23 09:13:47 -0700 |
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: data8 sys_fanotify_init data8 sys_fanotify_mark data8 sys_prlimit64 // 1325 + data8 sys_name_to_handle_at + data8 sys_open_by_handle_at + data8 sys_clock_adjtime + data8 sys_syncfs .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |