sparc: unify stat.h
authorSam Ravnborg <sam@ravnborg.org>
Sat, 3 Jan 2009 02:48:21 +0000 (18:48 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 3 Jan 2009 02:48:21 +0000 (18:48 -0800)
To my suprise struct stat64 was not equal on sparc 32 and sparc64,
so there was really nothing to share here.
Unify the files by adding their respective content to stat.h.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/include/asm/Kbuild
arch/sparc/include/asm/stat.h
arch/sparc/include/asm/stat_32.h [deleted file]
arch/sparc/include/asm/stat_64.h [deleted file]

index 57bcc1fe510aac4832b655d1dab976f53cfd3545..42cf48394d7e83cb4ede9380838cd16ca21189d3 100644 (file)
@@ -11,8 +11,6 @@ header-y += siginfo_32.h
 header-y += siginfo_64.h
 header-y += signal_32.h
 header-y += signal_64.h
-header-y += stat_32.h
-header-y += stat_64.h
 
 header-y += apc.h
 header-y += asi.h
index d8153013df7270d134416ed0ce272db68ab80cb7..55db5eca08e25da163b4c2156c51783b5b036f74 100644 (file)
@@ -1,8 +1,107 @@
-#ifndef ___ASM_SPARC_STAT_H
-#define ___ASM_SPARC_STAT_H
+#ifndef __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>
-#endif
-#endif
+/* 32 bit sparc */
+struct stat {
+       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_32.h b/arch/sparc/include/asm/stat_32.h
deleted file mode 100644 (file)
index 45b3ee4..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef _SPARC_STAT_H
-#define _SPARC_STAT_H
-
-#include <linux/types.h>
-
-struct stat {
-       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
diff --git a/arch/sparc/include/asm/stat_64.h b/arch/sparc/include/asm/stat_64.h
deleted file mode 100644 (file)
index 9650fde..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _SPARC64_STAT_H
-#define _SPARC64_STAT_H
-
-#include <linux/types.h>
-
-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];
-};
-
-#endif