Merge tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[firefly-linux-kernel-4.4.55.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 321d0ceb26d3782ed6871feef4c52090e9872b23..ed7e7ad5fee04ef0fe9e9a9ce53b3e42a6ddc552 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -51,7 +51,7 @@
 #include <linux/mempolicy.h>
 #include <linux/key.h>
 #include <linux/buffer_head.h>
-#include <linux/page_cgroup.h>
+#include <linux/page_ext.h>
 #include <linux/debug_locks.h>
 #include <linux/debugobjects.h>
 #include <linux/lockdep.h>
@@ -486,10 +486,10 @@ void __init __weak thread_info_cache_init(void)
 static void __init mm_init(void)
 {
        /*
-        * page_cgroup requires contiguous pages,
+        * page_ext requires contiguous pages,
         * bigger than MAX_ORDER unless SPARSEMEM.
         */
-       page_cgroup_init_flatmem();
+       page_ext_init_flatmem();
        mem_init();
        kmem_cache_init();
        percpu_init_late();
@@ -627,7 +627,7 @@ asmlinkage __visible void __init start_kernel(void)
                initrd_start = 0;
        }
 #endif
-       page_cgroup_init();
+       page_ext_init();
        debug_objects_mem_init();
        kmemleak_init();
        setup_per_cpu_pageset();
@@ -959,8 +959,13 @@ static int __ref kernel_init(void *unused)
                ret = run_init_process(execute_command);
                if (!ret)
                        return 0;
+#ifndef CONFIG_INIT_FALLBACK
+               panic("Requested init %s failed (error %d).",
+                     execute_command, ret);
+#else
                pr_err("Failed to execute %s (error %d).  Attempting defaults...\n",
-                       execute_command, ret);
+                      execute_command, ret);
+#endif
        }
        if (!try_to_run_init_process("/sbin/init") ||
            !try_to_run_init_process("/etc/init") ||