diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 16:18:17 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 16:18:17 -0400 |
commit | e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (patch) | |
tree | 2529afef2a74c40beaa3794d07b1b4a8ab374278 /arch/x86/kernel/setup.c | |
parent | 51ea8a88aae425915b458bfe295f1f10a3d52781 (diff) | |
parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) |
Merge branch 'x86/vmware' into x86/trampoline
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index c3a4fbb2b996..feb4c21e499a 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -83,7 +83,6 @@ | |||
83 | #include <asm/dmi.h> | 83 | #include <asm/dmi.h> |
84 | #include <asm/io_apic.h> | 84 | #include <asm/io_apic.h> |
85 | #include <asm/ist.h> | 85 | #include <asm/ist.h> |
86 | #include <asm/vmi.h> | ||
87 | #include <asm/setup_arch.h> | 86 | #include <asm/setup_arch.h> |
88 | #include <asm/bios_ebda.h> | 87 | #include <asm/bios_ebda.h> |
89 | #include <asm/cacheflush.h> | 88 | #include <asm/cacheflush.h> |
@@ -734,10 +733,10 @@ void __init setup_arch(char **cmdline_p) | |||
734 | printk(KERN_INFO "Command line: %s\n", boot_command_line); | 733 | printk(KERN_INFO "Command line: %s\n", boot_command_line); |
735 | #endif | 734 | #endif |
736 | 735 | ||
737 | /* VMI may relocate the fixmap; do this before touching ioremap area */ | 736 | /* |
738 | vmi_init(); | 737 | * If we have OLPC OFW, we might end up relocating the fixmap due to |
739 | 738 | * reserve_top(), so do this before touching the ioremap area. | |
740 | /* OFW also may relocate the fixmap */ | 739 | */ |
741 | olpc_ofw_detect(); | 740 | olpc_ofw_detect(); |
742 | 741 | ||
743 | early_trap_init(); | 742 | early_trap_init(); |
@@ -838,9 +837,6 @@ void __init setup_arch(char **cmdline_p) | |||
838 | 837 | ||
839 | x86_report_nx(); | 838 | x86_report_nx(); |
840 | 839 | ||
841 | /* Must be before kernel pagetables are setup */ | ||
842 | vmi_activate(); | ||
843 | |||
844 | /* after early param, so could get panic from serial */ | 840 | /* after early param, so could get panic from serial */ |
845 | reserve_early_setup_data(); | 841 | reserve_early_setup_data(); |
846 | 842 | ||