diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-13 18:36:07 +0100 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-13 18:36:07 +0100 |
commit | 6097a07411005c0184cf90256743c784079198fc (patch) | |
tree | 0c6496aa7de5f00a60ed8e7bac4b34f5acc7e30a /arch/x86/kvm/mmu.c | |
parent | arm64: Use generic sys_execve() implementation (diff) | |
parent | Linux 3.7-rc5 (diff) | |
download | linux-6097a07411005c0184cf90256743c784079198fc.tar.xz linux-6097a07411005c0184cf90256743c784079198fc.zip |
Merge tag 'v3.7-rc5' into execve
Linux 3.7-rc5
Conflicts:
arch/arm64/kernel/process.c
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) |