1 files changed, 4 insertions, 8 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 9e5cdaf73b48..a59f6a6df5e2 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -83,7 +83,6 @@
 #include <asm/dmi.h>
 #include <asm/io_apic.h>
 #include <asm/ist.h>
-#include <asm/vmi.h>
 #include <asm/setup_arch.h>
 #include <asm/bios_ebda.h>
 #include <asm/cacheflush.h>
@@ -691,10 +690,10 @@ void __init setup_arch(char **cmdline_p)
         printk(KERN_INFO "Command line: %s\n", boot_command_line);
 #endif
 
-        /* VMI may relocate the fixmap; do this before touching ioremap area */
-        vmi_init();
-
-        /* OFW also may relocate the fixmap */
+        /*
+         * If we have OLPC OFW, we might end up relocating the fixmap due to
+         * reserve_top(), so do this before touching the ioremap area.
+         */
         olpc_ofw_detect();
 
         early_trap_init();
@@ -795,9 +794,6 @@ void __init setup_arch(char **cmdline_p)
 
         x86_report_nx();
 
-        /* Must be before kernel pagetables are setup */
-        vmi_activate();
-
         /* after early param, so could get panic from serial */
         reserve_early_setup_data();