9 files changed, 29 insertions, 58 deletions

diff --git a/arch/powerpc/include/asm/posix_types.h b/arch/powerpc/include/asm/posix_types.h
index f1393252bbda..2958c5b97b2d 100644
--- a/arch/powerpc/include/asm/posix_types.h
+++ b/arch/powerpc/include/asm/posix_types.h
@@ -16,9 +16,6 @@ typedef int		__kernel_ssize_t;
 typedef long            __kernel_ptrdiff_t;
 #define __kernel_size_t __kernel_size_t
 
-typedef unsigned short  __kernel_nlink_t;
-#define __kernel_nlink_t __kernel_nlink_t
-
 typedef short           __kernel_ipc_pid_t;
 #define __kernel_ipc_pid_t __kernel_ipc_pid_t
 #endif
diff --git a/arch/powerpc/include/asm/stat.h b/arch/powerpc/include/asm/stat.h
index e4edc510b530..84880b80cc1c 100644
--- a/arch/powerpc/include/asm/stat.h
+++ b/arch/powerpc/include/asm/stat.h
@@ -30,11 +30,11 @@ struct stat {
         unsigned long   st_dev;
         ino_t           st_ino;
 #ifdef __powerpc64__
-        nlink_t         st_nlink;
+        unsigned long   st_nlink;
         mode_t          st_mode;
 #else
         mode_t          st_mode;
-        nlink_t         st_nlink;
+        unsigned short  st_nlink;
 #endif
         uid_t           st_uid;
         gid_t           st_gid;
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index a556ccc16b58..68831e9cf82f 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -140,7 +140,23 @@ static inline void set_restore_sigmask(void)
 {
         struct thread_info *ti = current_thread_info();
         ti->local_flags |= _TLF_RESTORE_SIGMASK;
-        set_bit(TIF_SIGPENDING, &ti->flags);
+        WARN_ON(!test_bit(TIF_SIGPENDING, &ti->flags));
+}
+static inline void clear_restore_sigmask(void)
+{
+        current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK;
+}
+static inline bool test_restore_sigmask(void)
+{
+        return current_thread_info()->local_flags & _TLF_RESTORE_SIGMASK;
+}
+static inline bool test_and_clear_restore_sigmask(void)
+{
+        struct thread_info *ti = current_thread_info();
+        if (!(ti->local_flags & _TLF_RESTORE_SIGMASK))
+                return false;
+        ti->local_flags &= ~_TLF_RESTORE_SIGMASK;
+        return true;
 }
 
 static inline bool test_thread_local_flags(unsigned int flags)
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 651c5963662b..5c023c9cf16e 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -51,16 +51,6 @@ void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
         return (void __user *)newsp;
 }
 
-
-/*
- * Restore the user process's signal mask
- */
-void restore_sigmask(sigset_t *set)
-{
-        sigdelsetmask(set, ~_BLOCKABLE);
-        set_current_blocked(set);
-}
-
 static void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka,
                                   int has_handler)
 {
@@ -114,30 +104,21 @@ static void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka,
 
 static int do_signal(struct pt_regs *regs)
 {
-        sigset_t *oldset;
+        sigset_t *oldset = sigmask_to_save();
         siginfo_t info;
         int signr;
         struct k_sigaction ka;
         int ret;
         int is32 = is_32bit_task();
 
-        if (current_thread_info()->local_flags & _TLF_RESTORE_SIGMASK)
-                oldset = &current->saved_sigmask;
-        else
-                oldset = &current->blocked;
-
         signr = get_signal_to_deliver(&info, &ka, regs, NULL);
 
         /* Is there any syscall restart business here ? */
         check_syscall_restart(regs, &ka, signr > 0);
 
         if (signr <= 0) {
-                struct thread_info *ti = current_thread_info();
                 /* No signal to deliver -- put the saved sigmask back */
-                if (ti->local_flags & _TLF_RESTORE_SIGMASK) {
-                        ti->local_flags &= ~_TLF_RESTORE_SIGMASK;
-                        sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
-                }
+                restore_saved_sigmask();
                 regs->trap = 0;
                 return 0;               /* no signals delivered */
         }
@@ -167,18 +148,7 @@ static int do_signal(struct pt_regs *regs)
 
         regs->trap = 0;
         if (ret) {
-                block_sigmask(&ka, signr);
-
-                /*
-                 * A signal was successfully delivered; the saved sigmask is in
-                 * its frame, and we can clear the TLF_RESTORE_SIGMASK flag.
-                 */
-                current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK;
-
-                /*
-                 * Let tracing know that we've done the handler setup.
-                 */
-                tracehook_signal_handler(signr, &info, &ka, regs,
+                signal_delivered(signr, &info, &ka, regs,
                                          test_thread_flag(TIF_SINGLESTEP));
         }
 
@@ -193,8 +163,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
         if (thread_info_flags & _TIF_NOTIFY_RESUME) {
                 clear_thread_flag(TIF_NOTIFY_RESUME);
                 tracehook_notify_resume(regs);
-                if (current->replacement_session_keyring)
-                        key_replace_session_keyring();
         }
 }
 
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h
index 8dde973aaaf5..e00acb413934 100644
--- a/arch/powerpc/kernel/signal.h
+++ b/arch/powerpc/kernel/signal.h
@@ -10,13 +10,10 @@
 #ifndef _POWERPC_ARCH_SIGNAL_H
 #define _POWERPC_ARCH_SIGNAL_H
 
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-
 extern void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags);
 
 extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
                                   size_t frame_size, int is_32);
-extern void restore_sigmask(sigset_t *set);
 
 extern int handle_signal32(unsigned long sig, struct k_sigaction *ka,
                            siginfo_t *info, sigset_t *oldset,
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 61f6aff25edc..8b4c049aee20 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -919,7 +919,7 @@ static int do_setcontext(struct ucontext __user *ucp, struct pt_regs *regs, int
         if (!access_ok(VERIFY_READ, mcp, sizeof(*mcp)))
                 return -EFAULT;
 #endif
-        restore_sigmask(&set);
+        set_current_blocked(&set);
         if (restore_user_regs(regs, mcp, sig))
                 return -EFAULT;
 
@@ -1273,7 +1273,7 @@ long sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
         set.sig[0] = sigctx.oldmask;
         set.sig[1] = sigctx._unused[3];
 #endif
-        restore_sigmask(&set);
+        set_current_blocked(&set);
 
         sr = (struct mcontext __user *)from_user_ptr(sigctx.regs);
         addr = sr;
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 2692efdb154e..d183f8719a50 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -335,7 +335,7 @@ int sys_swapcontext(struct ucontext __user *old_ctx,
 
         if (__copy_from_user(&set, &new_ctx->uc_sigmask, sizeof(set)))
                 do_exit(SIGSEGV);
-        restore_sigmask(&set);
+        set_current_blocked(&set);
         if (restore_sigcontext(regs, NULL, 0, &new_ctx->uc_mcontext))
                 do_exit(SIGSEGV);
 
@@ -364,7 +364,7 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
 
         if (__copy_from_user(&set, &uc->uc_sigmask, sizeof(set)))
                 goto badframe;
-        restore_sigmask(&set);
+        set_current_blocked(&set);
         if (restore_sigcontext(regs, NULL, 1, &uc->uc_mcontext))
                 goto badframe;
 
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
index 5b63bd3da4a9..e779642c25e5 100644
--- a/arch/powerpc/mm/mmu_context_nohash.c
+++ b/arch/powerpc/mm/mmu_context_nohash.c
@@ -333,9 +333,7 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
                                             unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned int)(long)hcpu;
-#ifdef CONFIG_HOTPLUG_CPU
-        struct task_struct *p;
-#endif
+
         /* We don't touch CPU 0 map, it's allocated at aboot and kept
          * around forever
          */
@@ -358,12 +356,7 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
                 stale_map[cpu] = NULL;
 
                 /* We also clear the cpu_vm_mask bits of CPUs going away */
-                read_lock(&tasklist_lock);
-                for_each_process(p) {
-                        if (p->mm)
-                                cpumask_clear_cpu(cpu, mm_cpumask(p->mm));
-                }
-                read_unlock(&tasklist_lock);
+                clear_tasks_mm_cpumask(cpu);
         break;
 #endif /* CONFIG_HOTPLUG_CPU */
         }
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 1d75c92ea8fb..66519d263da7 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -151,7 +151,7 @@ static void
 spufs_evict_inode(struct inode *inode)
 {
         struct spufs_inode_info *ei = SPUFS_I(inode);
-        end_writeback(inode);
+        clear_inode(inode);
         if (ei->i_ctx)
                 put_spu_context(ei->i_ctx);
         if (ei->i_gang)