diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 05:19:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 05:19:22 -0400 |
| commit | a35197a8be891072b3654dc7a2285573150dedee (patch) | |
| tree | f3829335b8a0cd40e2cdb94d7fefb54bf67977df /arch/x86/kvm/mmu.c | |
| parent | 6daad5c6c586bf07528ae5b39e801b204468f907 (diff) | |
| parent | 67a433ce278b98f47272726a22537fab7fd99de9 (diff) | |
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline
Diffstat (limited to 'arch/x86/kvm/mmu.c')
| -rw-r--r-- | arch/x86/kvm/mmu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index b6caf1329b1b..32cf11e5728a 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
| @@ -2897,8 +2897,7 @@ static int kvm_pv_mmu_write(struct kvm_vcpu *vcpu, | |||
| 2897 | 2897 | ||
| 2898 | static int kvm_pv_mmu_flush_tlb(struct kvm_vcpu *vcpu) | 2898 | static int kvm_pv_mmu_flush_tlb(struct kvm_vcpu *vcpu) |
| 2899 | { | 2899 | { |
| 2900 | kvm_x86_ops->tlb_flush(vcpu); | 2900 | kvm_set_cr3(vcpu, vcpu->arch.cr3); |
| 2901 | set_bit(KVM_REQ_MMU_SYNC, &vcpu->requests); | ||
| 2902 | return 1; | 2901 | return 1; |
| 2903 | } | 2902 | } |
| 2904 | 2903 | ||