---

yaml --- r: 129969 b: refs/heads/master c: ff4ce8c h: refs/heads/master i: 129967: 5013944 v: v3
git-mirror · Jan 23, 2009 · 202362c · 202362c
1 parent e7afb68
commit 202362c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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. */