diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-21 22:45:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-21 22:45:24 -0500 |
| commit | 4386b58349366511df1c4fe1f7917c198f71529a (patch) | |
| tree | 717f2d9c742a1a923cf8e85a56fe0f574315a769 | |
| parent | d13536bef4b42d3e24f5ae2429722d008c60e3fc (diff) | |
| parent | 2531be413b3f2f64c0282073de89fe52bbcbbab5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc32: Fix struct stat uid/gid types.
| -rw-r--r-- | arch/sparc/include/asm/stat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/stat.h b/arch/sparc/include/asm/stat.h index 55db5eca08e2..39327d6a57eb 100644 --- a/arch/sparc/include/asm/stat.h +++ b/arch/sparc/include/asm/stat.h | |||
| @@ -53,8 +53,8 @@ struct stat { | |||
| 53 | ino_t st_ino; | 53 | ino_t st_ino; |
| 54 | mode_t st_mode; | 54 | mode_t st_mode; |
| 55 | short st_nlink; | 55 | short st_nlink; |
| 56 | uid_t st_uid; | 56 | uid16_t st_uid; |
| 57 | gid_t st_gid; | 57 | gid16_t st_gid; |
| 58 | unsigned short st_rdev; | 58 | unsigned short st_rdev; |
| 59 | off_t st_size; | 59 | off_t st_size; |
| 60 | time_t st_atime; | 60 | time_t st_atime; |