2 files changed, 9 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 3f74784560a5..62b66acfdb30 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1388,6 +1388,13 @@ config FUTEX
           support for "fast userspace mutexes".  The resulting kernel may not
           run glibc-based applications correctly.
 
+config HAVE_FUTEX_CMPXCHG
+        bool
+        help
+          Architectures should select this if futex_atomic_cmpxchg_inatomic()
+          is implemented and always working. This removes a couple of runtime
+          checks.
+
 config EPOLL
         bool "Enable eventpoll support" if EXPERT
         default y
diff --git a/init/main.c b/init/main.c
index 2fd9cef70ee8..9c7fd4c9249f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -561,7 +561,6 @@ asmlinkage void __init start_kernel(void)
         init_timers();
         hrtimers_init();
         softirq_init();
-        acpi_early_init();
         timekeeping_init();
         time_init();
         sched_clock_postinit();
@@ -613,6 +612,7 @@ asmlinkage void __init start_kernel(void)
         calibrate_delay();
         pidmap_init();
         anon_vma_init();
+        acpi_early_init();
 #ifdef CONFIG_X86
         if (efi_enabled(EFI_RUNTIME_SERVICES))
                 efi_enter_virtual_mode();
@@ -812,7 +812,7 @@ void __init load_default_modules(void)
 static int run_init_process(const char *init_filename)
 {
         argv_init[0] = init_filename;
-        return do_execve(init_filename,
+        return do_execve(getname_kernel(init_filename),
                 (const char __user *const __user *)argv_init,
                 (const char __user *const __user *)envp_init);
 }