The patch titled
KVM: Re-fix vmx hardware_enable() on macbooks
has been removed from the -mm tree. Its filename was
kvm-fix-vmx-hardware_enable-on-macbooks-fix.patch
This patch was dropped because it was folded into kvm-fix-vmx-hardware_enable-on-macbooks.patch
------------------------------------------------------
Subject: KVM: Re-fix vmx hardware_enable() on macbooks
From: Avi Kivity <avi@xxxxxxxxxxxx>
This incremental patch fixes the macbook issue for real.
Signed-off-by: Avi Kivity <avi@xxxxxxxxxxxx>
Tested-by: Alex Larsson (sometimes testing helps)
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/kvm/vmx.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/kvm/vmx.c~kvm-fix-vmx-hardware_enable-on-macbooks-fix drivers/kvm/vmx.c
--- a/drivers/kvm/vmx.c~kvm-fix-vmx-hardware_enable-on-macbooks-fix
+++ a/drivers/kvm/vmx.c
@@ -534,7 +534,7 @@ static __init void hardware_enable(void
u64 old;
rdmsrl(MSR_IA32_FEATURE_CONTROL, old);
- if ((old & 4) == 0)
+ if ((old & 5) != 5)
/* enable and lock */
wrmsrl(MSR_IA32_FEATURE_CONTROL, old | 5);
write_cr4(read_cr4() | CR4_VMXE); /* FIXME: not cpu hotplug safe */
_
Patches currently in -mm which might be from avi@xxxxxxxxxxxx are
origin.patch
kvm-add-missing-include.patch
kvm-put-kvm-in-a-new-virtualization-menu.patch
kvm-clean-up-amd-svm-debug-registers-load-and-unload.patch
kvm-replace-__x86_64__-with-config_x86_64.patch
kvm-make-the-get_sregs-and-set_sregs-ioctls-symmetric.patch
kvm-move-find_vmx_entry-to-vmxc.patch
kvm-remove-extranous-put_cpu-from-vcpu_put.patch
kvm-mmu-ignore-pcd-pwt-and-pat-bits-on-ptes.patch
kvm-add-maintainers-entry.patch
kvm-disallow-the-kvm-amd-module-on-intel-hardware.patch
kvm-dont-touch-the-virtual-apic-vt-registers-on-32-bit.patch
kvm-fix-vmx-hardware_enable-on-macbooks.patch
kvm-fix-vmx-hardware_enable-on-macbooks-fix.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
