5 files changed, 53 insertions, 33 deletions

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 2727f9238359..6d8de051382b 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1722,7 +1722,12 @@ void cgroup_enable_task_cg_lists(void)
         use_task_css_set_links = 1;
         do_each_thread(g, p) {
                 task_lock(p);
-                if (list_empty(&p->cg_list))
+                /*
+                 * We should check if the process is exiting, otherwise
+                 * it will race with cgroup_exit() in that the list
+                 * entry won't be deleted though the process has exited.
+                 */
+                if (!(p->flags & PF_EXITING) && list_empty(&p->cg_list))
                         list_add(&p->cg_list, &p->cgroups->tasks);
                 task_unlock(p);
         } while_each_thread(g, p);
diff --git a/kernel/signal.c b/kernel/signal.c
index 6af1210092c3..cc8303cd093d 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1757,6 +1757,45 @@ static int do_signal_stop(int signr)
         return 1;
 }
 
+static int ptrace_signal(int signr, siginfo_t *info,
+                         struct pt_regs *regs, void *cookie)
+{
+        if (!(current->ptrace & PT_PTRACED))
+                return signr;
+
+        ptrace_signal_deliver(regs, cookie);
+
+        /* Let the debugger run.  */
+        ptrace_stop(signr, 0, info);
+
+        /* We're back.  Did the debugger cancel the sig?  */
+        signr = current->exit_code;
+        if (signr == 0)
+                return signr;
+
+        current->exit_code = 0;
+
+        /* Update the siginfo structure if the signal has
+           changed.  If the debugger wanted something
+           specific in the siginfo structure then it should
+           have updated *info via PTRACE_SETSIGINFO.  */
+        if (signr != info->si_signo) {
+                info->si_signo = signr;
+                info->si_errno = 0;
+                info->si_code = SI_USER;
+                info->si_pid = task_pid_vnr(current->parent);
+                info->si_uid = current->parent->uid;
+        }
+
+        /* If the (new) signal is now blocked, requeue it.  */
+        if (sigismember(&current->blocked, signr)) {
+                specific_send_sig_info(signr, info, current);
+                signr = 0;
+        }
+
+        return signr;
+}
+
 int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
                           struct pt_regs *regs, void *cookie)
 {
@@ -1785,36 +1824,10 @@ relock:
                 if (!signr)
                         break; /* will return 0 */
 
-                if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
-                        ptrace_signal_deliver(regs, cookie);
-
-                        /* Let the debugger run.  */
-                        ptrace_stop(signr, 0, info);
-
-                        /* We're back.  Did the debugger cancel the sig?  */
-                        signr = current->exit_code;
-                        if (signr == 0)
-                                continue;
-
-                        current->exit_code = 0;
-
-                        /* Update the siginfo structure if the signal has
-                           changed.  If the debugger wanted something
-                           specific in the siginfo structure then it should
-                           have updated *info via PTRACE_SETSIGINFO.  */
-                        if (signr != info->si_signo) {
-                                info->si_signo = signr;
-                                info->si_errno = 0;
-                                info->si_code = SI_USER;
-                                info->si_pid = task_pid_vnr(current->parent);
-                                info->si_uid = current->parent->uid;
-                        }
-
-                        /* If the (new) signal is now blocked, requeue it.  */
-                        if (sigismember(&current->blocked, signr)) {
-                                specific_send_sig_info(signr, info, current);
+                if (signr != SIGKILL) {
+                        signr = ptrace_signal(signr, info, regs, cookie);
+                        if (!signr)
                                 continue;
-                        }
                 }
 
                 ka = &current->sighand->action[signr-1];
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index e1bd50cbbf5d..fdfa0c745bb6 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -14,7 +14,7 @@
 #include <linux/cpu.h>
 #include <linux/err.h>
 #include <linux/hrtimer.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/profile.h>
 #include <linux/sched.h>
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 1bea399a9ef0..4f3886562b8c 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -14,12 +14,14 @@
 #include <linux/cpu.h>
 #include <linux/err.h>
 #include <linux/hrtimer.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/profile.h>
 #include <linux/sched.h>
 #include <linux/tick.h>
 
+#include <asm/irq_regs.h>
+
 #include "tick-internal.h"
 
 /*
diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c
index 0258d3115d54..450c04935b66 100644
--- a/kernel/time/tick-oneshot.c
+++ b/kernel/time/tick-oneshot.c
@@ -14,7 +14,7 @@
 #include <linux/cpu.h>
 #include <linux/err.h>
 #include <linux/hrtimer.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/profile.h>
 #include <linux/sched.h>