In paravirt builds with VMI compiled in, vmi_bringup is called
unconditionally, not via a paravirt-ops table (as no other hypervisor
uses the APIC startup technique). Make the calls to setup VMI state
conditional on the presence of the VMI ROM.
Signed-off-by: Zachary Amsden <zach at vmware.com>
diff -r 1915e2685a3c arch/i386/kernel/vmi.c
--- a/arch/i386/kernel/vmi.c Thu Jan 04 15:56:40 2007 -0800
+++ b/arch/i386/kernel/vmi.c Thu Jan 04 15:57:38 2007 -0800
@@ -645,7 +645,8 @@ void vmi_bringup(void)
void vmi_bringup(void)
{
/* We must establish the lowmem mapping for MMU ops to work */
- vmi_ops.set_linear_mapping(0, __PAGE_OFFSET, max_low_pfn, 0);
+ if (vmi_rom)
+ vmi_ops.set_linear_mapping(0, __PAGE_OFFSET, max_low_pfn, 0);
}
/*
