From 52258ef6430ea2c3a93942d30d44b3e6c8aa2110 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Thu, 28 Oct 2010 16:07:07 -0400
Subject: [PATCH] --- yaml --- r: 221577 b: refs/heads/master c:
 2c7387ef9969bb073c25ecbdcc5be30770267b16 h: refs/heads/master i:   221575:
 3d948c55f16ca41c0ac8478e6d5d22b5c8b5da29 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/tile/include/asm/stat.h   |  3 +++
 trunk/arch/tile/include/asm/unistd.h |  1 +
 trunk/arch/tile/kernel/compat.c      | 10 +++++-----
 trunk/include/asm-generic/stat.h     | 14 +++++++-------
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index e5fee1c1b056..12b8fe05a105 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1deb9c5dfb179819ecdbf80a1d121e26c63caab3
+refs/heads/master: 2c7387ef9969bb073c25ecbdcc5be30770267b16
diff --git a/trunk/arch/tile/include/asm/stat.h b/trunk/arch/tile/include/asm/stat.h
index 3dc90fa92c70..b16e5db8f0e7 100644
--- a/trunk/arch/tile/include/asm/stat.h
+++ b/trunk/arch/tile/include/asm/stat.h
@@ -1 +1,4 @@
+#ifdef CONFIG_COMPAT
+#define __ARCH_WANT_STAT64	/* Used for compat_sys_stat64() etc. */
+#endif
 #include <asm-generic/stat.h>
diff --git a/trunk/arch/tile/include/asm/unistd.h b/trunk/arch/tile/include/asm/unistd.h
index f2e3ff485333..b35c2db71199 100644
--- a/trunk/arch/tile/include/asm/unistd.h
+++ b/trunk/arch/tile/include/asm/unistd.h
@@ -41,6 +41,7 @@ __SYSCALL(__NR_cmpxchg_badaddr, sys_cmpxchg_badaddr)
 #ifdef CONFIG_COMPAT
 #define __ARCH_WANT_SYS_LLSEEK
 #endif
+#define __ARCH_WANT_SYS_NEWFSTATAT
 #endif
 
 #endif /* _ASM_TILE_UNISTD_H */
diff --git a/trunk/arch/tile/kernel/compat.c b/trunk/arch/tile/kernel/compat.c
index 77739cdd9462..67617a05e602 100644
--- a/trunk/arch/tile/kernel/compat.c
+++ b/trunk/arch/tile/kernel/compat.c
@@ -148,11 +148,11 @@ long tile_compat_sys_msgrcv(int msqid,
 #define compat_sys_readahead sys32_readahead
 #define compat_sys_sync_file_range compat_sys_sync_file_range2
 
-/* The native 64-bit "struct stat" matches the 32-bit "struct stat64". */
-#define compat_sys_stat64 sys_newstat
-#define compat_sys_lstat64 sys_newlstat
-#define compat_sys_fstat64 sys_newfstat
-#define compat_sys_fstatat64 sys_newfstatat
+/* We leverage the "struct stat64" type for 32-bit time_t/nsec. */
+#define compat_sys_stat64 sys_stat64
+#define compat_sys_lstat64 sys_lstat64
+#define compat_sys_fstat64 sys_fstat64
+#define compat_sys_fstatat64 sys_fstatat64
 
 /* The native sys_ptrace dynamically handles compat binaries. */
 #define compat_sys_ptrace sys_ptrace
diff --git a/trunk/include/asm-generic/stat.h b/trunk/include/asm-generic/stat.h
index 47e64170305d..bd8cad21998e 100644
--- a/trunk/include/asm-generic/stat.h
+++ b/trunk/include/asm-generic/stat.h
@@ -33,18 +33,18 @@ struct stat {
 	int		st_blksize;	/* Optimal block size for I/O.  */
 	int		__pad2;
 	long		st_blocks;	/* Number 512-byte blocks allocated. */
-	int		st_atime;	/* Time of last access.  */
-	unsigned int	st_atime_nsec;
-	int		st_mtime;	/* Time of last modification.  */
-	unsigned int	st_mtime_nsec;
-	int		st_ctime;	/* Time of last status change.  */
-	unsigned int	st_ctime_nsec;
+	long		st_atime;	/* Time of last access.  */
+	unsigned long	st_atime_nsec;
+	long		st_mtime;	/* Time of last modification.  */
+	unsigned long	st_mtime_nsec;
+	long		st_ctime;	/* Time of last status change.  */
+	unsigned long	st_ctime_nsec;
 	unsigned int	__unused4;
 	unsigned int	__unused5;
 };
 
-#if __BITS_PER_LONG != 64
 /* This matches struct stat64 in glibc2.1. Only used for 32 bit. */
+#if __BITS_PER_LONG != 64 || defined(__ARCH_WANT_STAT64)
 struct stat64 {
 	unsigned long long st_dev;	/* Device.  */
 	unsigned long long st_ino;	/* File serial number.  */