From 782f642db0aaf50b3443a20d10c504019262ec2d Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 19 May 2012 10:17:45 -0400 Subject: [PATCH] --- yaml --- r: 310015 b: refs/heads/master c: 1dfb5751a4de7c6a57a5602e8e2b87267cfc8c81 h: refs/heads/master i: 310013: 079a6bec5a81be0922db6f51e1d862e376fb809b 310011: efd44635989dfd21f365f561737980981f4252ee 310007: a28d2b6792a3f16818643a683b4996558933714b 309999: 11919ddc1d22a722955142c8e75bb172e5bddd5a 309983: 8ec673a95e74bb0b02c834440dbbc36d41466f9d 309951: 57ddf73a6a7097cb70a56fa009c7f9cbce0df5d1 309887: e85bfca3c86c97350c193105c22b74e9bcfa7f66 309759: f82b8e13acc675b5e799b8eebd79350747372d1e v: v3 --- [refs] | 2 +- trunk/arch/parisc/include/asm/stat.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e260cc7d945..2900f32b7839 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e57f93cc53b772b2049222410cf6a141a724529a +refs/heads/master: 1dfb5751a4de7c6a57a5602e8e2b87267cfc8c81 diff --git a/trunk/arch/parisc/include/asm/stat.h b/trunk/arch/parisc/include/asm/stat.h index 9d5fbbc5c31f..d76fbda5d62c 100644 --- a/trunk/arch/parisc/include/asm/stat.h +++ b/trunk/arch/parisc/include/asm/stat.h @@ -7,7 +7,7 @@ struct stat { unsigned int st_dev; /* dev_t is 32 bits on parisc */ ino_t st_ino; /* 32 bits */ mode_t st_mode; /* 16 bits */ - nlink_t st_nlink; /* 16 bits */ + unsigned short st_nlink; /* 16 bits */ unsigned short st_reserved1; /* old st_uid */ unsigned short st_reserved2; /* old st_gid */ unsigned int st_rdev; @@ -42,7 +42,7 @@ struct hpux_stat64 { unsigned int st_dev; /* dev_t is 32 bits on parisc */ ino_t st_ino; /* 32 bits */ mode_t st_mode; /* 16 bits */ - nlink_t st_nlink; /* 16 bits */ + unsigned short st_nlink; /* 16 bits */ unsigned short st_reserved1; /* old st_uid */ unsigned short st_reserved2; /* old st_gid */ unsigned int st_rdev;