Merge 'for-linus' branches from git://git.kernel.org/pub/scm/linux/kernel/git/viro/{vfs,signal}

233e562e · Linus Torvalds <[email protected]> · 2012-06-02 09:03:54 -07:00

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

Commit: 233e562eac549f4f719176bbddeb50c3f17a9c8d
Parents: 829f51db · 0fd7bee1 · a3936249

Merge commit. Changes below are compared with the first parent: 829f51db.

Changes

2 files changed · +2 −2

File	Status	Add	Del	Content
arch/frv/kernel/signal.c	modified	+1	−1	View file
arch/powerpc/include/asm/stat.h	modified	+1	−1	View file

arch/frv/kernel/signal.c

View file

diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index f3b9064..864c2f0 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 */

arch/powerpc/include/asm/stat.h

View file

diff --git a/arch/powerpc/include/asm/stat.h b/arch/powerpc/include/asm/stat.h
index 10cfb55..84880b8 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;