From 1cdec0a2badcc298953dee1c56cb0f7153d7b3d0 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 23 Mar 2012 15:01:54 -0700 Subject: [PATCH] --- yaml --- r: 295152 b: refs/heads/master c: 397a21f24d455982a8a6f9bc11b5f3326ce3c6ef h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/exit.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4114dfaf9123..7f33f4ed3271 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebec18a6d3aa1e7d84aab16225e87fd25170ec2b +refs/heads/master: 397a21f24d455982a8a6f9bc11b5f3326ce3c6ef diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index 456329fd4ea3..3db1909faed9 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -711,8 +711,11 @@ static struct task_struct *find_new_reaper(struct task_struct *father) if (unlikely(pid_ns->child_reaper == father)) { write_unlock_irq(&tasklist_lock); - if (unlikely(pid_ns == &init_pid_ns)) - panic("Attempted to kill init!"); + if (unlikely(pid_ns == &init_pid_ns)) { + panic("Attempted to kill init! exitcode=0x%08x\n", + father->signal->group_exit_code ?: + father->exit_code); + } zap_pid_ns_processes(pid_ns); write_lock_irq(&tasklist_lock);