diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 18:01:10 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 18:01:10 (GMT) |
| commit | a9417357cff6027f9d6b1740f821baa59f2381f4 (patch) | |
| tree | 15306e02a9a5c244fdf9c97e34c6cd3e4c45ef20 /drivers/kvm/x86_emulate.c | |
| parent | 17c38b7490b3f0300c7812aefdae2ddda7ab4112 (diff) | |
| parent | d37c85571904a622cbabc7a2e04b8c919de75ac0 (diff) | |
| download | linux-fsl-qoriq-a9417357cff6027f9d6b1740f821baa59f2381f4.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: disable writeback for 0x0f 0x01 instructions.
KVM: Fix removal of nx capability from guest cpuid
Revert "KVM: Avoid useless memory write when possible"
KVM: Fix unlikely kvm_create vs decache_vcpus_on_cpu race
KVM: Correctly handle writes crossing a page boundary
Diffstat (limited to 'drivers/kvm/x86_emulate.c')
| -rw-r--r-- | drivers/kvm/x86_emulate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c index 1b800fc..1f979cb 100644 --- a/drivers/kvm/x86_emulate.c +++ b/drivers/kvm/x86_emulate.c @@ -1178,6 +1178,8 @@ pop_instruction: twobyte_insn: switch (b) { case 0x01: /* lgdt, lidt, lmsw */ + /* Disable writeback. */ + no_wb = 1; switch (modrm_reg) { u16 size; unsigned long address; |