3 files changed, 3 insertions, 11 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index 464c2b172f07..9578c1ae19ca 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -813,7 +813,7 @@ static void exit_notify(struct task_struct *tsk)
                 __kill_pgrp_info(SIGCONT, SEND_SIG_PRIV, pgrp);
         }
 
-        /* Let father know we died 
+        /* Let father know we died
          *
          * Thread signals are configurable, but you aren't going to use
          * that to send signals to arbitary processes. 
@@ -826,9 +826,7 @@ static void exit_notify(struct task_struct *tsk)
          * If our self_exec id doesn't match our parent_exec_id then
          * we have changed execution domain as these two values started
          * the same after a fork.
-         *      
          */
-        
         if (tsk->exit_signal != SIGCHLD && tsk->exit_signal != -1 &&
             ( tsk->parent_exec_id != t->self_exec_id  ||
               tsk->self_exec_id != tsk->parent_exec_id)
@@ -848,9 +846,7 @@ static void exit_notify(struct task_struct *tsk)
         }
 
         state = EXIT_ZOMBIE;
-        if (tsk->exit_signal == -1 &&
-            (likely(tsk->ptrace == 0) ||
-             unlikely(tsk->parent->signal->flags & SIGNAL_GROUP_EXIT)))
+        if (tsk->exit_signal == -1 && likely(!tsk->ptrace))
                 state = EXIT_DEAD;
         tsk->exit_state = state;
 
diff --git a/kernel/printk.c b/kernel/printk.c
index 051d27e36a6c..bd2cd062878d 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -732,7 +732,7 @@ int __init add_preferred_console(char *name, int idx, char *options)
         return 0;
 }
 
-int __init update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options)
+int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options)
 {
         struct console_cmdline *c;
         int i;
diff --git a/kernel/signal.c b/kernel/signal.c
index ef8156a6aad5..b27c01a66448 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1561,10 +1561,6 @@ static inline int may_ptrace_stop(void)
                     (current->ptrace & PT_ATTACHED)))
                 return 0;
 
-        if (unlikely(current->signal == current->parent->signal) &&
-            unlikely(current->signal->flags & SIGNAL_GROUP_EXIT))
-                return 0;
-
         /*
          * Are we in the middle of do_coredump?
          * If so and our tracer is also part of the coredump stopping