diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 09:02:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 09:02:14 +0100 |
commit | 80da549e5225c6f80d45f76ba2b3a4574ed278ae (patch) | |
tree | 59799c3d7b7d4a088abdfa3052c3682ed826ba7e /arch/x86/kvm/mmu.c | |
parent | ASoC: wm2200: Convert over to wm_adsp for ADSP1 support (diff) | |
parent | Linux 3.7-rc6 (diff) | |
download | linux-80da549e5225c6f80d45f76ba2b3a4574ed278ae.tar.xz linux-80da549e5225c6f80d45f76ba2b3a4574ed278ae.zip |
Merge tag 'v3.7-rc6' into asoc-wm2200
Linux 3.7-rc6
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) |