3 files changed, 14 insertions, 15 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index bc982cd72743..b0c6f0c3a2df 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -347,7 +347,7 @@ int disallow_signal(int sig)
                 return -EINVAL;
 
         spin_lock_irq(&current->sighand->siglock);
-        sigaddset(&current->blocked, sig);
+        current->sighand->action[(sig)-1].sa.sa_handler = SIG_IGN;
         recalc_sigpending();
         spin_unlock_irq(&current->sighand->siglock);
         return 0;
diff --git a/kernel/kthread.c b/kernel/kthread.c
index 0eb0070a3c57..df8a8e8f6ca4 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -215,24 +215,13 @@ EXPORT_SYMBOL(kthread_stop);
 static __init void kthreadd_setup(void)
 {
         struct task_struct *tsk = current;
-        struct k_sigaction sa;
-        sigset_t blocked;
 
         set_task_comm(tsk, "kthreadd");
 
-        /* Block and flush all signals */
-        sigfillset(&blocked);
-        sigprocmask(SIG_BLOCK, &blocked, NULL);
-        flush_signals(tsk);
+        ignore_signals(tsk);
 
-        /* SIG_IGN makes children autoreap: see do_notify_parent(). */
-        sa.sa.sa_handler = SIG_IGN;
-        sa.sa.sa_flags = 0;
-        siginitset(&sa.sa.sa_mask, sigmask(SIGCHLD));
-        do_sigaction(SIGCHLD, &sa, (struct k_sigaction *)0);
-
-        set_user_nice(current, -5);
-        set_cpus_allowed(current, CPU_MASK_ALL);
+        set_user_nice(tsk, -5);
+        set_cpus_allowed(tsk, CPU_MASK_ALL);
 }
 
 int kthreadd(void *unused)
diff --git a/kernel/signal.c b/kernel/signal.c
index 23ae6d62fc41..2ac3a668d9dd 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -209,6 +209,16 @@ void flush_signals(struct task_struct *t)
         spin_unlock_irqrestore(&t->sighand->siglock, flags);
 }
 
+void ignore_signals(struct task_struct *t)
+{
+        int i;
+
+        for (i = 0; i < _NSIG; ++i)
+                t->sighand->action[i].sa.sa_handler = SIG_IGN;
+
+        flush_signals(t);
+}
+
 /*
  * Flush all handlers for a task.
  */