diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-22 04:45:24 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-22 04:45:24 +0100 |
| commit | 4386b58349366511df1c4fe1f7917c198f71529a (patch) | |
| tree | 717f2d9c742a1a923cf8e85a56fe0f574315a769 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| parent | sparc32: Fix struct stat uid/gid types. (diff) | |
| download | linux-4386b58349366511df1c4fe1f7917c198f71529a.tar.xz linux-4386b58349366511df1c4fe1f7917c198f71529a.zip | |
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 { ino_t st_ino; mode_t st_mode; short st_nlink; - uid_t st_uid; - gid_t st_gid; + uid16_t st_uid; + gid16_t st_gid; unsigned short st_rdev; off_t st_size; time_t st_atime; |