summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-21 19:45:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-21 19:45:24 -0800
commit4386b58349366511df1c4fe1f7917c198f71529a (patch)
tree717f2d9c742a1a923cf8e85a56fe0f574315a769 /arch
parentd13536bef4b42d3e24f5ae2429722d008c60e3fc (diff)
parent2531be413b3f2f64c0282073de89fe52bbcbbab5 (diff)
downloadlinux-3.10-4386b58349366511df1c4fe1f7917c198f71529a.tar.gz
linux-3.10-4386b58349366511df1c4fe1f7917c198f71529a.tar.bz2
linux-3.10-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.
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/include/asm/stat.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/stat.h b/arch/sparc/include/asm/stat.h
index 55db5eca08e..39327d6a57e 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;