From 9baed2da25fd5b9df00ad0d6cd242d62dded73b2 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 21 Nov 2007 17:28:37 +0900
Subject: [PATCH] --- yaml --- r: 77775 b: refs/heads/master c:
 17bfa6397875e6901c3cafdc711437041664d94c h: refs/heads/master i:   77773:
 51d2c06c7cadae7a3833276619883118ff651b8f   77771:
 992b54049c278bd1d00b1f6c00bcb346e37aeaa5   77767:
 b98afcfad380d3d69502e60cab2ccd87f7be7135   77759:
 08a00472a7d89549b6dbb15959f7305a2dc860f6 v: v3

---
 [refs]                      |  2 +-
 trunk/include/asm-sh/stat.h | 63 ++++++++++++++++++++++++++++++++++++-
 trunk/include/asm-sh/user.h |  7 +++++
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7927aeb799b8..8eafbee93e78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8eef8800f1c693a2de6374b1948c8ea5e0ad75f
+refs/heads/master: 17bfa6397875e6901c3cafdc711437041664d94c
diff --git a/trunk/include/asm-sh/stat.h b/trunk/include/asm-sh/stat.h
index 6d6ad26e3a2a..e1810cc6e3da 100644
--- a/trunk/include/asm-sh/stat.h
+++ b/trunk/include/asm-sh/stat.h
@@ -15,6 +15,66 @@ struct __old_kernel_stat {
 	unsigned long  st_ctime;
 };
 
+#if defined(__SH5__) || defined(CONFIG_CPU_SH5)
+struct stat {
+	unsigned short st_dev;
+	unsigned short __pad1;
+	unsigned long st_ino;
+	unsigned short st_mode;
+	unsigned short st_nlink;
+	unsigned short st_uid;
+	unsigned short st_gid;
+	unsigned short st_rdev;
+	unsigned short __pad2;
+	unsigned long  st_size;
+	unsigned long  st_blksize;
+	unsigned long  st_blocks;
+	unsigned long  st_atime;
+	unsigned long  st_atime_nsec;
+	unsigned long  st_mtime;
+	unsigned long  st_mtime_nsec;
+	unsigned long  st_ctime;
+	unsigned long  st_ctime_nsec;
+	unsigned long  __unused4;
+	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	st_atime_nsec;
+
+	unsigned long	st_mtime;
+	unsigned long	st_mtime_nsec;
+
+	unsigned long	st_ctime;
+	unsigned long	st_ctime_nsec;	/* will be high 32 bits of ctime someday */
+
+	unsigned long	__unused1;
+	unsigned long	__unused2;
+};
+#else
 struct stat {
 	unsigned long  st_dev;
 	unsigned long  st_ino;
@@ -67,11 +127,12 @@ struct stat64 {
 	unsigned long	st_mtime_nsec;
 
 	unsigned long	st_ctime;
-	unsigned long	st_ctime_nsec; 
+	unsigned long	st_ctime_nsec;
 
 	unsigned long long	st_ino;
 };
 
 #define STAT_HAVE_NSEC 1
+#endif
 
 #endif /* __ASM_SH_STAT_H */
diff --git a/trunk/include/asm-sh/user.h b/trunk/include/asm-sh/user.h
index d1b8511d9d9f..706b1c7baba9 100644
--- a/trunk/include/asm-sh/user.h
+++ b/trunk/include/asm-sh/user.h
@@ -27,12 +27,19 @@
  *	to write an integer number of pages.
  */
 
+#if defined(__SH5__) || defined(CONFIG_CPU_SH5)
+struct user fpu_struct {
+	unsigned long fp_regs[32];
+	unsigned int fpscr;
+};
+#else
 struct user_fpu_struct {
 	unsigned long fp_regs[16];
 	unsigned long xfp_regs[16];
 	unsigned long fpscr;
 	unsigned long fpul;
 };
+#endif
 
 struct user {
 	struct pt_regs	regs;			/* entire machine state */