The patch titled
Vmi: native fix
has been added to the -mm tree. Its filename is
paravirt-vmi-backend-for-paravirt-ops-native-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Vmi: native fix
From: Zachary Amsden <zach@xxxxxxxxxx>
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@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Chris Wright <chrisw@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/vmi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN arch/i386/kernel/vmi.c~paravirt-vmi-backend-for-paravirt-ops-native-fix arch/i386/kernel/vmi.c
--- a/arch/i386/kernel/vmi.c~paravirt-vmi-backend-for-paravirt-ops-native-fix
+++ a/arch/i386/kernel/vmi.c
@@ -630,7 +630,8 @@ static inline int __init probe_vmi_rom(v
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);
}
/*
_
Patches currently in -mm which might be from zach@xxxxxxxxxx are
convert-i386-pda-code-to-use-%fs.patch
paravirt-page-allocation-hooks-for-vmi-backend.patch
paravirt-paravirt-cpu-hypercall-batching-mode.patch
paravirt-iopl-handling-for-paravirt-guests.patch
paravirt-smp-boot-hook-for-paravirt.patch
paravirt-vmi-backend-for-paravirt-ops.patch
paravirt-vmi-backend-for-paravirt-ops-compile-fix.patch
paravirt-vmi-backend-for-paravirt-ops-initialize-fs-for-smp.patch
paravirt-vmi-backend-for-paravirt-ops-native-fix.patch
paravirt-vmi-timer-patches.patch
vmi-versus-hrtimers.patch
i386-apic-clean-up-the-apic-code.patch
i386-apic-rework-and-fix-local-apic-calibration.patch
dynticks-i386-prepare-nmi-watchdog.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
