Merge tag 'drm/tegra/for-5.6-rc1-fixes' of git://anongit.freedesktop.org/tegra/linux...

[linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index ec3a1463ac692a7ad15661ab65a52f30e50256df..da1bc0b60a7de3119113a8dace48c79928f5a927 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -93,7 +93,6 @@
 #include <linux/rodata_test.h>
 #include <linux/jump_label.h>
 #include <linux/mem_encrypt.h>
-#include <linux/file.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -554,6 +553,7 @@ static void __init mm_init(void)
         * bigger than MAX_ORDER unless SPARSEMEM.
         */
        page_ext_init_flatmem();
+       init_debug_pagealloc();
        report_meminit();
        mem_init();
        kmem_cache_init();
@@ -1158,26 +1158,13 @@ static int __ref kernel_init(void *unused)
 
 void console_on_rootfs(void)
 {
-       struct file *file;
-       unsigned int i;
-
-       /* Open /dev/console in kernelspace, this should never fail */
-       file = filp_open("/dev/console", O_RDWR, 0);
-       if (!file)
-               goto err_out;
-
-       /* create stdin/stdout/stderr, this should never fail */
-       for (i = 0; i < 3; i++) {
-               if (f_dupfd(i, file, 0) != i)
-                       goto err_out;
-       }
-
-       return;
+       /* Open the /dev/console as stdin, this should never fail */
+       if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+               pr_err("Warning: unable to open an initial console.\n");
 
-err_out:
-       /* no panic -- this might not be fatal */
-       pr_err("Warning: unable to open an initial console.\n");
-       return;
+       /* create stdout/stderr */
+       (void) ksys_dup(0);
+       (void) ksys_dup(0);
 }
 
 static noinline void __init kernel_init_freeable(void)