diff options
| author | Tony Lindgren | 2012-11-09 23:58:01 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2012-11-09 23:58:01 +0100 |
| commit | edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a (patch) | |
| tree | 61425adc8b2059a9c12a3ce66ba7361fea1b0bb3 /arch/x86/kvm/mmu.c | |
| parent | ARM: OMAP: Remove omap_init_consistent_dma_size() (diff) | |
| parent | Linux 3.7-rc4 (diff) | |
| download | kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.gz kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.xz kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.zip | |
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
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 d289fee1ffb8..6f85fe0bf958 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2497,8 +2497,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, } } - if (!is_error_pfn(pfn)) - kvm_release_pfn_clean(pfn); + kvm_release_pfn_clean(pfn); } static void nonpaging_new_cr3(struct kvm_vcpu *vcpu) |