Merge with Linux 2.3.38.

1 files changed, 36 insertions, 0 deletions

diff --git a/include/asm-ppc/stat.h b/include/asm-ppc/stat.h
index d6d868312..7cc8654e0 100644
--- a/include/asm-ppc/stat.h
+++ b/include/asm-ppc/stat.h
@@ -16,6 +16,7 @@ struct __old_kernel_stat {
 	unsigned long  st_mtime;
 	unsigned long  st_ctime;
 };
+
 struct stat {
 	dev_t		st_dev;
 	ino_t		st_ino;
@@ -37,4 +38,39 @@ struct stat {
 	unsigned long  	__unused5;
 };
 
+/* This matches struct stat64 in glibc2.1, hence the absolutely
+ * insane amounts of padding around dev_t's.
+ */
+struct stat64 {
+	unsigned short	st_dev;
+	unsigned char	__pad0[10];
+
+	unsigned long	st_ino;
+	unsigned int	st_mode;
+	unsigned int	st_nlink;
+
+	unsigned long	st_uid;
+	unsigned long	st_gid;
+
+	unsigned short	st_rdev;
+	unsigned char	__pad3[10];
+
+	long long	st_size;
+	unsigned long	st_blksize;
+
+	unsigned long	st_blocks;	/* Number 512-byte blocks allocated. */
+	unsigned long	__pad4;		/* future possible st_blocks high bits */
+
+	unsigned long	st_atime;
+	unsigned long	__pad5;
+
+	unsigned long	st_mtime;
+	unsigned long	__pad6;
+
+	unsigned long	st_ctime;
+	unsigned long	__pad7;		/* will be high 32 bits of ctime someday */
+
+	unsigned long	__unused1;
+	unsigned long	__unused2;
+};
 #endif