From a6179b817dcf55b804fb5bf07dbe3bc2e168f37b Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sat, 2 Jun 2012 13:08:39 +0200
Subject: [PATCH] --- yaml --- r: 310387 b: refs/heads/master c:
 a3936249694775d8fb25d19ddf0ed6263e33dd14 h: refs/heads/master i:   310385:
 c423df5de77e5f8cd56fef410a89bea0d6550adf   310383:
 19793fa15e7a66aecc0e01a92a37139bb7d9400b v: v3

---
 [refs]                                | 2 +-
 trunk/arch/frv/kernel/signal.c        | 2 +-
 trunk/arch/powerpc/include/asm/stat.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3c712039f698..ba5de0ba58d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fd7bee1e9b68fd271ad87c3e705facd1ca38055
+refs/heads/master: a3936249694775d8fb25d19ddf0ed6263e33dd14
diff --git a/trunk/arch/frv/kernel/signal.c b/trunk/arch/frv/kernel/signal.c
index f3b9064c548c..864c2f0d497b 100644
--- a/trunk/arch/frv/kernel/signal.c
+++ b/trunk/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 */
diff --git a/trunk/arch/powerpc/include/asm/stat.h b/trunk/arch/powerpc/include/asm/stat.h
index 84880b80cc1c..10cfb558e0fd 100644
--- a/trunk/arch/powerpc/include/asm/stat.h
+++ b/trunk/arch/powerpc/include/asm/stat.h
@@ -30,7 +30,7 @@ struct stat {
 	unsigned long	st_dev;
 	ino_t		st_ino;
 #ifdef __powerpc64__
-	unsigned long	st_nlink;
+	unsigned short	st_nlink;
 	mode_t		st_mode;
 #else
 	mode_t		st_mode;