diff options
-rw-r--r-- | arch/sparc/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/stat.h | 111 | ||||
-rw-r--r-- | arch/sparc/include/asm/stat_32.h | 62 | ||||
-rw-r--r-- | arch/sparc/include/asm/stat_64.h | 47 |
4 files changed, 105 insertions, 117 deletions
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild index 57bcc1fe510a..42cf48394d7e 100644 --- a/arch/sparc/include/asm/Kbuild +++ b/arch/sparc/include/asm/Kbuild | |||
@@ -11,8 +11,6 @@ header-y += siginfo_32.h | |||
11 | header-y += siginfo_64.h | 11 | header-y += siginfo_64.h |
12 | header-y += signal_32.h | 12 | header-y += signal_32.h |
13 | header-y += signal_64.h | 13 | header-y += signal_64.h |
14 | header-y += stat_32.h | ||
15 | header-y += stat_64.h | ||
16 | 14 | ||
17 | header-y += apc.h | 15 | header-y += apc.h |
18 | header-y += asi.h | 16 | header-y += asi.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 */ | ||
diff --git a/arch/sparc/include/asm/stat_32.h b/arch/sparc/include/asm/stat_32.h deleted file mode 100644 index 45b3ee4472e1..000000000000 --- a/arch/sparc/include/asm/stat_32.h +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | #ifndef _SPARC_STAT_H | ||
2 | #define _SPARC_STAT_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | |||
6 | struct stat { | ||
7 | unsigned short st_dev; | ||
8 | ino_t st_ino; | ||
9 | mode_t st_mode; | ||
10 | short st_nlink; | ||
11 | uid_t st_uid; | ||
12 | gid_t st_gid; | ||
13 | unsigned short st_rdev; | ||
14 | off_t st_size; | ||
15 | time_t st_atime; | ||
16 | unsigned long st_atime_nsec; | ||
17 | time_t st_mtime; | ||
18 | unsigned long st_mtime_nsec; | ||
19 | time_t st_ctime; | ||
20 | unsigned long st_ctime_nsec; | ||
21 | off_t st_blksize; | ||
22 | off_t st_blocks; | ||
23 | unsigned long __unused4[2]; | ||
24 | }; | ||
25 | |||
26 | #define STAT_HAVE_NSEC 1 | ||
27 | |||
28 | struct stat64 { | ||
29 | unsigned long long st_dev; | ||
30 | |||
31 | unsigned long long st_ino; | ||
32 | |||
33 | unsigned int st_mode; | ||
34 | unsigned int st_nlink; | ||
35 | |||
36 | unsigned int st_uid; | ||
37 | unsigned int st_gid; | ||
38 | |||
39 | unsigned long long st_rdev; | ||
40 | |||
41 | unsigned char __pad3[8]; | ||
42 | |||
43 | long long st_size; | ||
44 | unsigned int st_blksize; | ||
45 | |||
46 | unsigned char __pad4[8]; | ||
47 | unsigned int st_blocks; | ||
48 | |||
49 | unsigned int st_atime; | ||
50 | unsigned int st_atime_nsec; | ||
51 | |||
52 | unsigned int st_mtime; | ||
53 | unsigned int st_mtime_nsec; | ||
54 | |||
55 | unsigned int st_ctime; | ||
56 | unsigned int st_ctime_nsec; | ||
57 | |||
58 | unsigned int __unused4; | ||
59 | unsigned int __unused5; | ||
60 | }; | ||
61 | |||
62 | #endif | ||
diff --git a/arch/sparc/include/asm/stat_64.h b/arch/sparc/include/asm/stat_64.h deleted file mode 100644 index 9650fdea847f..000000000000 --- a/arch/sparc/include/asm/stat_64.h +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | #ifndef _SPARC64_STAT_H | ||
2 | #define _SPARC64_STAT_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | |||
6 | struct stat { | ||
7 | unsigned st_dev; | ||
8 | ino_t st_ino; | ||
9 | mode_t st_mode; | ||
10 | short st_nlink; | ||
11 | uid_t st_uid; | ||
12 | gid_t st_gid; | ||
13 | unsigned st_rdev; | ||
14 | off_t st_size; | ||
15 | time_t st_atime; | ||
16 | time_t st_mtime; | ||
17 | time_t st_ctime; | ||
18 | off_t st_blksize; | ||
19 | off_t st_blocks; | ||
20 | unsigned long __unused4[2]; | ||
21 | }; | ||
22 | |||
23 | struct stat64 { | ||
24 | unsigned long st_dev; | ||
25 | unsigned long st_ino; | ||
26 | unsigned long st_nlink; | ||
27 | |||
28 | unsigned int st_mode; | ||
29 | unsigned int st_uid; | ||
30 | unsigned int st_gid; | ||
31 | unsigned int __pad0; | ||
32 | |||
33 | unsigned long st_rdev; | ||
34 | long st_size; | ||
35 | long st_blksize; | ||
36 | long st_blocks; | ||
37 | |||
38 | unsigned long st_atime; | ||
39 | unsigned long st_atime_nsec; | ||
40 | unsigned long st_mtime; | ||
41 | unsigned long st_mtime_nsec; | ||
42 | unsigned long st_ctime; | ||
43 | unsigned long st_ctime_nsec; | ||
44 | long __unused[3]; | ||
45 | }; | ||
46 | |||
47 | #endif | ||