From a3936249694775d8fb25d19ddf0ed6263e33dd14 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sat, 2 Jun 2012 13:08:39 +0200 Subject: frv: Remove bogus closing parenthesis Introduced by commit 6fd84c0831ec78d98736b76dc5e9b849f1dbfc9e ("TIF_RESTORE_SIGMASK can be set only when TIF_SIGPENDING is set") Signed-off-by: Geert Uytterhoeven Signed-off-by: Al Viro --- arch/frv/kernel/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index f3b9064c548..864c2f0d497 100644 --- a/arch/frv/kernel/signal.c +++ b/arch/frv/kernel/signal.c @@ -518,7 +518,7 @@ asmlinkage void do_notify_resume(__u32 thread_info_flags) clear_thread_flag(TIF_SINGLESTEP); /* deal with pending signal delivery */ - if (thread_info_flags & _TIF_SIGPENDING)) + if (thread_info_flags & _TIF_SIGPENDING) do_signal(); /* deal with notification on about to resume userspace execution */ -- cgit v1.2.3 From 0fd7bee1e9b68fd271ad87c3e705facd1ca38055 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Sat, 2 Jun 2012 21:34:52 +1000 Subject: 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 Signed-off-by: Al Viro --- arch/powerpc/include/asm/stat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/stat.h b/arch/powerpc/include/asm/stat.h index 10cfb558e0f..84880b80cc1 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; -- cgit v1.2.3