Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / arch / arm / kernel / calls.S

diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 19326d7cdeb3cdf6a517e1c25f27b0c4fbaab4fa..7e97b7376563d2b6afbce8803b2ab796d29e87d9 100644 (file)
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -336,7 +336,7 @@
                CALL(sys_mknodat)
 /* 325 */      CALL(sys_fchownat)
                CALL(sys_futimesat)
-               CALL(sys_fstatat64)
+               CALL(ABI(sys_fstatat64,  sys_oabi_fstatat64))
                CALL(sys_unlinkat)
                CALL(sys_renameat)
 /* 330 */      CALL(sys_linkat)
@@ -350,7 +350,7 @@
                CALL(sys_set_robust_list)
                CALL(sys_get_robust_list)
 /* 340 */      CALL(sys_splice)
-               CALL(sys_arm_sync_file_range)
+               CALL(sys_sync_file_range2)
                CALL(sys_tee)
                CALL(sys_vmsplice)
                CALL(sys_move_pages)
@@ -359,8 +359,9 @@
                CALL(sys_kexec_load)
                CALL(sys_utimensat)
                CALL(sys_signalfd)
-/* 350 */      CALL(sys_timerfd)
+/* 350 */      CALL(sys_ni_syscall)
                CALL(sys_eventfd)
+               CALL(sys_fallocate)
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted