From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Oct 2012 01:08:42 +0000 (+0300)
Subject: Merge tag 'kvm-3.7-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Url: https://git.openfabrics.org/?p=~shefty%2Frdma-dev.git;a=commitdiff_plain;h=3d0ceac129f3ea0b125289055a3aa7519d38df77;hp=-c

Merge tag 'kvm-3.7-2' of git://git./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
---

3d0ceac129f3ea0b125289055a3aa7519d38df77
diff --combined virt/kvm/kvm_main.c
index e59bb63cb08,a65bc02a375..be70035fd42
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@@ -1322,9 -1322,7 +1322,7 @@@ EXPORT_SYMBOL_GPL(kvm_release_page_clea
  
  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);
@@@ -1568,7 -1566,8 +1566,7 @@@ void mark_page_dirty_in_slot(struct kv
  	if (memslot && memslot->dirty_bitmap) {
  		unsigned long rel_gfn = gfn - memslot->base_gfn;
  
 -		/* TODO: introduce set_bit_le() and use it */
 -		test_and_set_bit_le(rel_gfn, memslot->dirty_bitmap);
 +		set_bit_le(rel_gfn, memslot->dirty_bitmap);
  	}
  }