---

yaml --- r: 295152 b: refs/heads/master c: 397a21f h: refs/heads/master v: v3
git-mirror · Mar 23, 2012 · 1cdec0a · 1cdec0a
1 parent 6145372
commit 1cdec0a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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);