Merge branch 'omap2-upstream' into devel

2 files changed, 25 insertions, 1 deletions

diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 95f1c121cb30..30a67a5a40a8 100644
--- 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)
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
index e8b98046895b..96ab5f52949c 100644
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@@ -25,6 +25,7 @@
  * sys_stat64:
  * sys_lstat64:
  * sys_fstat64:
+ * sys_fstatat64:
  *
  *   struct stat64 has different sizes and some members are shifted
  *   Compatibility wrappers are needed for them and provided below.
@@ -169,6 +170,29 @@ asmlinkage long sys_oabi_fstat64(unsigned long fd,
         return error;
 }
 
+asmlinkage long sys_oabi_fstatat64(int dfd,
+                                   char __user *filename,
+                                   struct oldabi_stat64  __user *statbuf,
+                                   int flag)
+{
+        struct kstat stat;
+        int error = -EINVAL;
+
+        if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0)
+                goto out;
+
+        if (flag & AT_SYMLINK_NOFOLLOW)
+                error = vfs_lstat_fd(dfd, filename, &stat);
+        else
+                error = vfs_stat_fd(dfd, filename, &stat);
+
+        if (!error)
+        error = cp_oldabi_stat64(&stat, statbuf);
+
+out:
+        return error;
+}
+
 struct oabi_flock64 {
         short   l_type;
         short   l_whence;