aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/init/main.c b/init/main.c
index 4cb47a159f02..106e02d7ffa5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -806,11 +806,6 @@ static noinline int init_post(void)
806 system_state = SYSTEM_RUNNING; 806 system_state = SYSTEM_RUNNING;
807 numa_default_policy(); 807 numa_default_policy();
808 808
809 if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
810 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
811
812 (void) sys_dup(0);
813 (void) sys_dup(0);
814 809
815 current->signal->flags |= SIGNAL_UNKILLABLE; 810 current->signal->flags |= SIGNAL_UNKILLABLE;
816 811
@@ -873,6 +868,12 @@ static int __init kernel_init(void * unused)
873 868
874 do_basic_setup(); 869 do_basic_setup();
875 870
871 /* Open the /dev/console on the rootfs, this should never fail */
872 if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
873 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
874
875 (void) sys_dup(0);
876 (void) sys_dup(0);
876 /* 877 /*
877 * check if there is an early userspace init. If yes, let it do all 878 * check if there is an early userspace init. If yes, let it do all
878 * the work 879 * the work