summaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-24 04:08:42 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-24 04:08:42 +0300
commit3d0ceac129f3ea0b125289055a3aa7519d38df77 (patch)
tree6918573b28401c11c3cd201fe845effb64bbbf17 /virt/kvm
parente17b1315832b97700502200f0a3dde3ac0fbc839 (diff)
parentc5e015d4949aa665c486cae6884beb00b97e3dea (diff)
downloadop-kernel-dev-3d0ceac129f3ea0b125289055a3aa7519d38df77.zip
op-kernel-dev-3d0ceac129f3ea0b125289055a3aa7519d38df77.tar.gz
Merge tag 'kvm-3.7-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fixes from Avi Kivity: "KVM updates for 3.7-rc2" * tag 'kvm-3.7-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM guest: exit idleness when handling KVM_PV_REASON_PAGE_NOT_PRESENT KVM: apic: fix LDR calculation in x2apic mode KVM: MMU: fix release noslot pfn
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/kvm_main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index e59bb63..be70035 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1322,9 +1322,7 @@ EXPORT_SYMBOL_GPL(kvm_release_page_clean);
void kvm_release_pfn_clean(pfn_t pfn)
{
- WARN_ON(is_error_pfn(pfn));
-
- if (!kvm_is_mmio_pfn(pfn))
+ if (!is_error_pfn(pfn) && !kvm_is_mmio_pfn(pfn))
put_page(pfn_to_page(pfn));
}
EXPORT_SYMBOL_GPL(kvm_release_pfn_clean);
OpenPOWER on IntegriCloud