From dd774271a72846f81021d3cb401f29ab4076dc00 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 18 Feb 2009 14:08:58 +0100
Subject: [PATCH] --- yaml --- r: 133743 b: refs/heads/master c:
 fc5659c8c6b6c4e02ac354b369017c1bf231f347 h: refs/heads/master i:   133741:
 4eec1220d424b174545aa92ff7b898d715eb275d   133739:
 f5c29276482dc91a119c195b301eca8a560fc499   133735:
 fc3ffd5cf7611fa368d9a41c29a738729ca5a78c   133727:
 445de9901cf33d39e0281f547a630c6f5251051b v: v3

---
 [refs]                    | 2 +-
 trunk/virt/kvm/kvm_main.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e13b37729555..6b14dd10b893 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c807660407a695f390034e402edfe544a1d2e40c
+refs/heads/master: fc5659c8c6b6c4e02ac354b369017c1bf231f347
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
index 266bdaf0ce44..0ed662dc72d2 100644
--- a/trunk/virt/kvm/kvm_main.c
+++ b/trunk/virt/kvm/kvm_main.c
@@ -535,8 +535,10 @@ static inline int valid_vcpu(int n)
 
 inline int kvm_is_mmio_pfn(pfn_t pfn)
 {
-	if (pfn_valid(pfn))
-		return PageReserved(pfn_to_page(pfn));
+	if (pfn_valid(pfn)) {
+		struct page *page = compound_head(pfn_to_page(pfn));
+		return PageReserved(page);
+	}
 
 	return true;
 }