diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-28 15:14:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-28 15:14:11 -0500 |
commit | d4dc3b24427f91f112b18562dac73f7af60b7a21 (patch) | |
tree | 18a2ff25d7f2b0d5fc5e5cef6b671e8c6a08033c /arch/sparc/include/uapi/asm/stat.h | |
parent | ec3c07377bd87e24a9a17a352fa4771173d4638a (diff) | |
parent | 9ef595d83aea6b4d93c9a120df3c5db2e226929f (diff) | |
download | op-kernel-dev-d4dc3b24427f91f112b18562dac73f7af60b7a21.zip op-kernel-dev-d4dc3b24427f91f112b18562dac73f7af60b7a21.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Minor typing cleanup from Joe Perches, and some comment typo fixes
from Adam Buchbinder"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: Convert naked unsigned uses to unsigned int
sparc: Fix misspellings in comments.
Diffstat (limited to 'arch/sparc/include/uapi/asm/stat.h')
-rw-r--r-- | arch/sparc/include/uapi/asm/stat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/uapi/asm/stat.h b/arch/sparc/include/uapi/asm/stat.h index a232e9e..2f0583a 100644 --- a/arch/sparc/include/uapi/asm/stat.h +++ b/arch/sparc/include/uapi/asm/stat.h @@ -6,13 +6,13 @@ #if defined(__sparc__) && defined(__arch64__) /* 64 bit sparc */ struct stat { - unsigned st_dev; + unsigned int st_dev; ino_t st_ino; mode_t st_mode; short st_nlink; uid_t st_uid; gid_t st_gid; - unsigned st_rdev; + unsigned int st_rdev; off_t st_size; time_t st_atime; time_t st_mtime; |