aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c
index 4cdcd06e6d78..036f97c0c34c 100644
--- a/init/main.c
+++ b/init/main.c
@@ -51,6 +51,7 @@
51#include <linux/debug_locks.h> 51#include <linux/debug_locks.h>
52#include <linux/lockdep.h> 52#include <linux/lockdep.h>
53#include <linux/utsrelease.h> 53#include <linux/utsrelease.h>
54#include <linux/pid_namespace.h>
54#include <linux/compile.h> 55#include <linux/compile.h>
55 56
56#include <asm/io.h> 57#include <asm/io.h>
@@ -626,8 +627,6 @@ static int __init initcall_debug_setup(char *str)
626} 627}
627__setup("initcall_debug", initcall_debug_setup); 628__setup("initcall_debug", initcall_debug_setup);
628 629
629struct task_struct *child_reaper = &init_task;
630
631extern initcall_t __initcall_start[], __initcall_end[]; 630extern initcall_t __initcall_start[], __initcall_end[];
632 631
633static void __init do_initcalls(void) 632static void __init do_initcalls(void)
@@ -727,7 +726,7 @@ static int init(void * unused)
727 * assumptions about where in the task array this 726 * assumptions about where in the task array this
728 * can be found. 727 * can be found.
729 */ 728 */
730 child_reaper = current; 729 init_pid_ns.child_reaper = current;
731 730
732 cad_pid = task_pid(current); 731 cad_pid = task_pid(current);
733 732