From 202362cdea03eefc54d14567c83a0bb44a4dc5ad Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 23 Jan 2009 16:26:21 +0000
Subject: [PATCH] --- yaml --- r: 129969 b: refs/heads/master c:
 ff4ce8c332859508dc97826ab8b7f42bb9c212c9 h: refs/heads/master i:   129967:
 5013944851e1ea03644e266bc6d4e4ce7fa004ff v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/xen/balloon.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 096b8513d1a1..dd3959fda44d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42ef73fe134732b2e91c0326df5fd568da17c4b2
+refs/heads/master: ff4ce8c332859508dc97826ab8b7f42bb9c212c9
diff --git a/trunk/drivers/xen/balloon.c b/trunk/drivers/xen/balloon.c
index 8069d520c460..2ba8f95516a0 100644
--- a/trunk/drivers/xen/balloon.c
+++ b/trunk/drivers/xen/balloon.c
@@ -299,10 +299,13 @@ static int decrease_reservation(unsigned long nr_pages)
 
 		scrub_page(page);
 
-		ret = HYPERVISOR_update_va_mapping(
-			(unsigned long)__va(pfn << PAGE_SHIFT),
-			__pte_ma(0), 0);
-		BUG_ON(ret);
+		if (!PageHighMem(page)) {
+			ret = HYPERVISOR_update_va_mapping(
+				(unsigned long)__va(pfn << PAGE_SHIFT),
+				__pte_ma(0), 0);
+			BUG_ON(ret);
+                }
+
 	}
 
 	/* Ensure that ballooned highmem pages don't have kmaps. */