Commit 233e562eac549f4f719176bbddeb50c3f17a9c8d
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
Merge 'for-linus' branches from git://git.kernel.org/pub/scm/linux/kernel/git/viro/{vfs,signal}
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
Showing 2 changed files Side-by-side Diff
arch/frv/kernel/signal.c
| ... | ... | @@ -518,7 +518,7 @@ |
| 518 | 518 | clear_thread_flag(TIF_SINGLESTEP); |
| 519 | 519 | |
| 520 | 520 | /* deal with pending signal delivery */ |
| 521 | - if (thread_info_flags & _TIF_SIGPENDING)) | |
| 521 | + if (thread_info_flags & _TIF_SIGPENDING) | |
| 522 | 522 | do_signal(); |
| 523 | 523 | |
| 524 | 524 | /* deal with notification on about to resume userspace execution */ |