4 files changed, 16 insertions, 2 deletions

diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 2b6b4c786e65..db07ce42b3b2 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -284,7 +284,7 @@ __syscall_start:
                 .long   sys_fstatfs64
                 .long   sys_tgkill
                 .long   sys_utimes
-/* 270 */       .long   sys_fadvise64_64
+/* 270 */       .long   sys_arm_fadvise64_64_wrapper
                 .long   sys_pciconfig_iobase
                 .long   sys_pciconfig_read
                 .long   sys_pciconfig_write
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 3f8d0e3aefab..6281d488ac97 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -265,6 +265,10 @@ sys_futex_wrapper:
                 str     r5, [sp, #4]            @ push sixth arg
                 b       sys_futex
 
+sys_arm_fadvise64_64_wrapper:
+                str     r5, [sp, #4]            @ push r5 to stack
+                b       sys_arm_fadvise64_64
+
 /*
  * Note: off_4k (r5) is always units of 4K.  If we can't do the requested
  * offset, we return EINVAL.
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index f897ce2ccf0d..42629ff84f5a 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -311,3 +311,13 @@ long execve(const char *filename, char **argv, char **envp)
         return ret;
 }
 EXPORT_SYMBOL(execve);
+
+/*
+ * Since loff_t is a 64 bit type we avoid a lot of ABI hastle
+ * with a different argument ordering.
+ */
+asmlinkage long sys_arm_fadvise64_64(int fd, int advice,
+                                     loff_t offset, loff_t len)
+{
+        return sys_fadvise64_64(fd, offset, len, advice);
+}
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
index 94619ccee789..278de61224d1 100644
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -295,7 +295,7 @@
 #define __NR_fstatfs64                  (__NR_SYSCALL_BASE+267)
 #define __NR_tgkill                     (__NR_SYSCALL_BASE+268)
 #define __NR_utimes                     (__NR_SYSCALL_BASE+269)
-#define __NR_fadvise64_64               (__NR_SYSCALL_BASE+270)
+#define __NR_arm_fadvise64_64           (__NR_SYSCALL_BASE+270)
 #define __NR_pciconfig_iobase           (__NR_SYSCALL_BASE+271)
 #define __NR_pciconfig_read             (__NR_SYSCALL_BASE+272)
 #define __NR_pciconfig_write            (__NR_SYSCALL_BASE+273)