diff --git a/[refs] b/[refs] index 025d001b712f..9ea0bc28550c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ea1c5392cc8ce249fb661db4f4cdfbbae373a89 +refs/heads/master: 82d821ddca8f5c990067cc37543010aa9346a172 diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c index 5333c7d7427f..2a88477330fc 100644 --- a/trunk/fs/compat.c +++ b/trunk/fs/compat.c @@ -114,6 +114,7 @@ asmlinkage long compat_sys_newlstat(char __user * filename, return error; } +#ifndef __ARCH_WANT_STAT64 asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user *filename, struct compat_stat __user *statbuf, int flag) { @@ -134,6 +135,7 @@ asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user *filename, out: return error; } +#endif asmlinkage long compat_sys_newfstat(unsigned int fd, struct compat_stat __user * statbuf)