Pull vfs fix and a fix from the signal changes for frv from Al Viro. The __kernel_nlink_t for powerpc got scrogged because 64-bit powerpc actually depended on the default "unsigned long", while 32-bit powerpc had an explicit override to "unsigned short". Al didn't notice, and made both of them be the unsigned short. The frv signal fix is fallout from simplifying the do_notify_resume() code, and leaving an extra parenthesis. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: powerpc: Fix size of st_nlink on 64bit * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: frv: Remove bogus closing parenthesis
Unified · Split
| @@ -518,7 +518,7 @@ asmlinkage void do_notify_resume(__u32 thread_info_flags) · 517 unmodified lines | |||
| 518 | clear_thread_flag(TIF_SINGLESTEP); | 518 | clear_thread_flag(TIF_SINGLESTEP); |
| 519 | 519 | ||
| 520 | /* deal with pending signal delivery */ | 520 | /* deal with pending signal delivery */ |
| 521 | if (thread_info_flags & _TIF_SIGPENDING)) | 521 | if (thread_info_flags & _TIF_SIGPENDING) |
| 522 | do_signal(); | 522 | do_signal(); |
| 523 | 523 | ||
| 524 | /* deal with notification on about to resume userspace execution */ | 524 | /* deal with notification on about to resume userspace execution */ |
| @@ -30,7 +30,7 @@ struct stat { · 29 unmodified lines | |||
| 30 | unsigned long st_dev; | 30 | unsigned long st_dev; |
| 31 | ino_t st_ino; | 31 | ino_t st_ino; |
| 32 | #ifdef __powerpc64__ | 32 | #ifdef __powerpc64__ |
| 33 | unsigned short st_nlink; | 33 | unsigned long st_nlink; |
| 34 | mode_t st_mode; | 34 | mode_t st_mode; |
| 35 | #else | 35 | #else |
| 36 | mode_t st_mode; | 36 | mode_t st_mode; |