---

yaml --- r: 310387 b: refs/heads/master c: a393624 h: refs/heads/master i: 310385: c423df5 310383: 19793fa v: v3
git-mirror · Jun 2, 2012 · a6179b8 · a6179b8
1 parent 6b48f01
commit a6179b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;