diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 17:41:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 17:41:00 -0400 |
| commit | c45140a996b511bccdcbbdbea7e36f001826bdf2 (patch) | |
| tree | 8d6613880399d1a25598f7cb51834efbbda87ad9 /arch/sparc/include | |
| parent | de329820e920cd9cfbc2127cad26a37026260cce (diff) | |
| parent | 9e8307ecaf9f8c8b5b3b22145021204c4e73114a (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:
sparc64: Properly truncate pt_regs framepointer in perf callback.
arch/sparc/kernel: Use set_cpus_allowed_ptr
sparc: Fix use of uid16_t and gid16_t in asm/stat.h
Diffstat (limited to 'arch/sparc/include')
| -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 39327d6a57eb..a232e9e1f4e5 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 | uid16_t st_uid; | 56 | unsigned short st_uid; |
| 57 | gid16_t st_gid; | 57 | unsigned short 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; |