1 files changed, 105 insertions, 6 deletions
diff --git a/arch/sparc/include/asm/stat.h b/arch/sparc/include/asm/stat.h
index d8153013df72..55db5eca08e2 100644
--- a/arch/sparc/include/asm/stat.h
+++ b/arch/sparc/include/asm/stat.h
@@ -1,8 +1,107 @@
-#ifndef ___ASM_SPARC_STAT_H
+#ifndef __SPARC_STAT_H
-#define ___ASM_SPARC_STAT_H
+#define __SPARC_STAT_H
+#include <linux/types.h>
 #if defined(__sparc__) && defined(__arch64__)
-#include <asm/stat_64.h>
+/* 64 bit sparc */
+struct stat {
+        unsigned   st_dev;
+        ino_t   st_ino;
+        mode_t  st_mode;
+        short   st_nlink;
+        uid_t   st_uid;
+        gid_t   st_gid;
+        unsigned   st_rdev;
+        off_t   st_size;
+        time_t  st_atime;
+        time_t  st_mtime;
+        time_t  st_ctime;
+        off_t   st_blksize;
+        off_t   st_blocks;
+        unsigned long  __unused4[2];
+};
+struct stat64 {
+        unsigned long   st_dev;
+        unsigned long   st_ino;
+        unsigned long   st_nlink;
+        unsigned int    st_mode;
+        unsigned int    st_uid;
+        unsigned int    st_gid;
+        unsigned int    __pad0;
+        unsigned long   st_rdev;
+        long            st_size;
+        long            st_blksize;
+        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;
+        long            __unused[3];
+};
 #else
-#include <asm/stat_32.h>
+/* 32 bit sparc */
-#endif
+struct stat {
-#endif
+        unsigned short  st_dev;
+        ino_t           st_ino;
+        mode_t          st_mode;
+        short           st_nlink;
+        uid_t           st_uid;
+        gid_t           st_gid;
+        unsigned short  st_rdev;
+        off_t           st_size;
+        time_t          st_atime;
+        unsigned long   st_atime_nsec;
+        time_t          st_mtime;
+        unsigned long   st_mtime_nsec;
+        time_t          st_ctime;
+        unsigned long   st_ctime_nsec;
+        off_t           st_blksize;
+        off_t           st_blocks;
+        unsigned long   __unused4[2];
+};
+#define STAT_HAVE_NSEC 1
+struct stat64 {
+        unsigned long long st_dev;
+        unsigned long long st_ino;
+        unsigned int    st_mode;
+        unsigned int    st_nlink;
+        unsigned int    st_uid;
+        unsigned int    st_gid;
+        unsigned long long st_rdev;
+        unsigned char   __pad3[8];
+        long long       st_size;
+        unsigned int    st_blksize;
+        unsigned char   __pad4[8];
+        unsigned int    st_blocks;
+        unsigned int    st_atime;
+        unsigned int    st_atime_nsec;
+        unsigned int    st_mtime;
+        unsigned int    st_mtime_nsec;
+        unsigned int    st_ctime;
+        unsigned int    st_ctime_nsec;
+        unsigned int    __unused4;
+        unsigned int    __unused5;
+};
+#endif /* defined(__sparc__) && defined(__arch64__) */
+#endif /* __SPARC_STAT_H */

diff --git a/arch/sparc/include/asm/stat.h b/arch/sparc/include/asm/stat.h index d8153013df72..55db5eca08e2 100644 --- a/arch/sparc/include/asm/stat.h +++ b/arch/sparc/include/asm/stat.h
@@ -1,8 +1,107 @@
1	#ifndef ___ASM_SPARC_STAT_H	1	#ifndef __SPARC_STAT_H
2	#define ___ASM_SPARC_STAT_H	2	#define __SPARC_STAT_H
		3
		4	#include <linux/types.h>
		5
3	#if defined(__sparc__) && defined(__arch64__)	6	#if defined(__sparc__) && defined(__arch64__)
4	#include <asm/stat_64.h>	7	/* 64 bit sparc */
		8	struct stat {
		9	unsigned st_dev;
		10	ino_t st_ino;
		11	mode_t st_mode;
		12	short st_nlink;
		13	uid_t st_uid;
		14	gid_t st_gid;
		15	unsigned st_rdev;
		16	off_t st_size;
		17	time_t st_atime;
		18	time_t st_mtime;
		19	time_t st_ctime;
		20	off_t st_blksize;
		21	off_t st_blocks;
		22	unsigned long __unused4[2];
		23	};
		24
		25	struct stat64 {
		26	unsigned long st_dev;
		27	unsigned long st_ino;
		28	unsigned long st_nlink;
		29
		30	unsigned int st_mode;
		31	unsigned int st_uid;
		32	unsigned int st_gid;
		33	unsigned int __pad0;
		34
		35	unsigned long st_rdev;
		36	long st_size;
		37	long st_blksize;
		38	long st_blocks;
		39
		40	unsigned long st_atime;
		41	unsigned long st_atime_nsec;
		42	unsigned long st_mtime;
		43	unsigned long st_mtime_nsec;
		44	unsigned long st_ctime;
		45	unsigned long st_ctime_nsec;
		46	long __unused[3];
		47	};
		48
5	#else	49	#else
6	#include <asm/stat_32.h>	50	/* 32 bit sparc */
7	#endif	51	struct stat {
8	#endif	52	unsigned short st_dev;
		53	ino_t st_ino;
		54	mode_t st_mode;
		55	short st_nlink;
		56	uid_t st_uid;
		57	gid_t st_gid;
		58	unsigned short st_rdev;
		59	off_t st_size;
		60	time_t st_atime;
		61	unsigned long st_atime_nsec;
		62	time_t st_mtime;
		63	unsigned long st_mtime_nsec;
		64	time_t st_ctime;
		65	unsigned long st_ctime_nsec;
		66	off_t st_blksize;
		67	off_t st_blocks;
		68	unsigned long __unused4[2];
		69	};
		70
		71	#define STAT_HAVE_NSEC 1
		72
		73	struct stat64 {
		74	unsigned long long st_dev;
		75
		76	unsigned long long st_ino;
		77
		78	unsigned int st_mode;
		79	unsigned int st_nlink;
		80
		81	unsigned int st_uid;
		82	unsigned int st_gid;
		83
		84	unsigned long long st_rdev;
		85
		86	unsigned char __pad3[8];
		87
		88	long long st_size;
		89	unsigned int st_blksize;
		90
		91	unsigned char __pad4[8];
		92	unsigned int st_blocks;
		93
		94	unsigned int st_atime;
		95	unsigned int st_atime_nsec;
		96
		97	unsigned int st_mtime;
		98	unsigned int st_mtime_nsec;
		99
		100	unsigned int st_ctime;
		101	unsigned int st_ctime_nsec;
		102
		103	unsigned int __unused4;
		104	unsigned int __unused5;
		105	};
		106	#endif /* defined(__sparc__) && defined(__arch64__) */
		107	#endif /* __SPARC_STAT_H */