diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-12 10:38:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-12 10:38:42 -0800 |
| commit | 5d2007ebc278525cbe8d2e3ef559a4b191ee4ded (patch) | |
| tree | 04287151da2ecbd8055703d34b0b572709651137 /arch/x86/kvm/vmx.c | |
| parent | 1c1271850494f06b63ae6b485e2e1b9c27ffb2d1 (diff) | |
| parent | e17d1dc0863767bab8fde4ba9be92c7f79e7fe50 (diff) | |
| download | linux-5d2007ebc278525cbe8d2e3ef559a4b191ee4ded.tar.gz linux-5d2007ebc278525cbe8d2e3ef559a4b191ee4ded.tar.bz2 linux-5d2007ebc278525cbe8d2e3ef559a4b191ee4ded.zip | |
Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: Fix pit memory leak if unable to allocate irq source id
KVM: ia64: fix vmm_spin_{un}lock for !CONFIG_SMP
KVM: VMX: Set IGMT bit in EPT entry
KVM: Require the PCI subsystem
x86: KVM guest: fix section mismatch warning in kvmclock.c
KVM: ia64: Use guest signal mask when blocking
KVM: MMU: increase per-vcpu rmap cache alloc size
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 2643b430d83a..d06b4dc0e2ea 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3564,7 +3564,8 @@ static int __init vmx_init(void) bypass_guest_pf = 0; kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK | VMX_EPT_WRITABLE_MASK | - VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT); + VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT | + VMX_EPT_IGMT_BIT); kvm_mmu_set_mask_ptes(0ull, 0ull, 0ull, 0ull, VMX_EPT_EXECUTABLE_MASK); kvm_enable_tdp(); |