From 5013944851e1ea03644e266bc6d4e4ce7fa004ff Mon Sep 17 00:00:00 2001
From: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Thu, 22 Jan 2009 14:36:08 -0800
Subject: [PATCH] --- yaml --- r: 129967 b: refs/heads/master c:
 1058a75f07b9bb8323fb5197be5526220f8b75cf h: refs/heads/master i:   129965:
 b60c62c74bbcb31eb5a3ceab0f1f2900918cb449   129963:
 36c6e6205f81798a8ac016b29b29e9a415cdae2c   129959:
 0167f72fe5ec09c2902b9dfe58ac471833c145fc   129951:
 02d577e5c0a8ab9aed5a8c002938b1b4cc8b7072 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/xen/balloon.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5ead4dc589d8..eff73adf9205 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 066941bd4eeb159307a5d7d795100d0887c00442
+refs/heads/master: 1058a75f07b9bb8323fb5197be5526220f8b75cf
diff --git a/trunk/drivers/xen/balloon.c b/trunk/drivers/xen/balloon.c
index 8dc7109d61b7..8069d520c460 100644
--- a/trunk/drivers/xen/balloon.c
+++ b/trunk/drivers/xen/balloon.c
@@ -298,6 +298,11 @@ static int decrease_reservation(unsigned long nr_pages)
 		frame_list[i] = pfn_to_mfn(pfn);
 
 		scrub_page(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. */