diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /include/asm-sparc/stat_64.h | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-sparc/stat_64.h')
| -rw-r--r-- | include/asm-sparc/stat_64.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/include/asm-sparc/stat_64.h b/include/asm-sparc/stat_64.h deleted file mode 100644 index 9650fdea847f..000000000000 --- a/include/asm-sparc/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 | ||