Merge 'for-linus' branches from git://git.kernel.org/pub/scm/linux/kernel/git/viro...

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

diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index f3b9064c548c1e3b3870c5a450b9f333d64ff082..864c2f0d497bfa62800e4168cac94215bff4d128 100644 (file)
--- 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 */

diff --git a/arch/powerpc/include/asm/stat.h b/arch/powerpc/include/asm/stat.h
index 10cfb558e0fd7d1a82df840dd67c3578be1cbe52..84880b80cc1ce7811924ec18e68bbd75431371f6 100644 (file)
--- 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;