Merge branches 'acpi-ec', 'acpi-soc', 'acpi-video' and 'acpi-resources'

[android-x86/kernel.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 179ada1..6f0f1c5 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -953,13 +953,8 @@ 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);
-#endif
        }
        if (!try_to_run_init_process("/sbin/init") ||
            !try_to_run_init_process("/etc/init") ||