diff options
author | Anton Blanchard <anton@samba.org> | 2012-06-02 13:34:52 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-02 16:44:11 +0200 |
commit | 0fd7bee1e9b68fd271ad87c3e705facd1ca38055 (patch) | |
tree | dab55cbc3e8c31d419ebf9fbb5e7f180c66d52ee /arch | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
download | linux-0fd7bee1e9b68fd271ad87c3e705facd1ca38055.tar.xz linux-0fd7bee1e9b68fd271ad87c3e705facd1ca38055.zip |
powerpc: Fix size of st_nlink on 64bit
commit e57f93cc53b7 (powerpc: get rid of nlink_t uses, switch to
explicitly-sized type) changed the size of st_nlink on ppc64 from
a long to a short, resulting in boot failures.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/include/asm/stat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/stat.h b/arch/powerpc/include/asm/stat.h index 10cfb558e0fd..84880b80cc1c 100644 --- a/arch/powerpc/include/asm/stat.h +++ b/arch/powerpc/include/asm/stat.h @@ -30,7 +30,7 @@ struct stat { unsigned long st_dev; ino_t st_ino; #ifdef __powerpc64__ - unsigned short st_nlink; + unsigned long st_nlink; mode_t st_mode; #else mode_t st_mode; |