diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 13:18:17 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 13:18:17 -0700 |
| commit | e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (patch) | |
| tree | 2529afef2a74c40beaa3794d07b1b4a8ab374278 /arch/x86/kernel/setup.c | |
| parent | 51ea8a88aae425915b458bfe295f1f10a3d52781 (diff) | |
| parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) | |
| download | kernel_samsung_crespo-e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4.tar.gz kernel_samsung_crespo-e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4.tar.bz2 kernel_samsung_crespo-e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4.zip | |
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 c3a4fbb2b99..feb4c21e499 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> @@ -734,10 +733,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(); @@ -838,9 +837,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(); |