Merge remote-tracking branch 'kvm/linux-next'

[karo-tx-linux.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index b3386ae3438bef82283774db6c734704038adea6..e7dc9dccaa8804659e07f8ea65b62d045b3e75ec 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -941,6 +941,10 @@ void __init setup_arch(char **cmdline_p)
 
        reserve_initrd();
 
+#if defined(CONFIG_ACPI) && defined(CONFIG_BLK_DEV_INITRD)
+       acpi_initrd_override((void *)initrd_start, initrd_end - initrd_start);
+#endif
+
        reserve_crashkernel();
 
        vsmp_init();
@@ -961,9 +965,7 @@ void __init setup_arch(char **cmdline_p)
        kvmclock_init();
 #endif
 
-       x86_init.paging.pagetable_setup_start(swapper_pg_dir);
-       paging_init();
-       x86_init.paging.pagetable_setup_done(swapper_pg_dir);
+       x86_init.paging.pagetable_init();
 
        if (boot_cpu_data.cpuid_level >= 0) {
                /* A CPU has %cr4 if and only if it has CPUID */