From 50a1311d0ef6b12b5f359ba1949904d530d71902 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Mon, 17 Nov 2008 09:35:00 -0800
Subject: [PATCH] --- yaml --- r: 119209 b: refs/heads/master c:
 26a3e99160cfb06a0a33e25b9fb0d516e2cc680d h: refs/heads/master i:   119207:
 22ee6b73340ae8060c14c510ab4bd4ed0eb42677 v: v3

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

diff --git a/[refs] b/[refs]
index ae95c556cbb7..6f3219561a48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3c6aa1e69f705ac3ab64584101b1d38435b1353
+refs/heads/master: 26a3e99160cfb06a0a33e25b9fb0d516e2cc680d
diff --git a/trunk/drivers/xen/balloon.c b/trunk/drivers/xen/balloon.c
index a0fb5eac407c..526c191e84ea 100644
--- a/trunk/drivers/xen/balloon.c
+++ b/trunk/drivers/xen/balloon.c
@@ -122,14 +122,7 @@ static struct timer_list balloon_timer;
 static void scrub_page(struct page *page)
 {
 #ifdef CONFIG_XEN_SCRUB_PAGES
-	if (PageHighMem(page)) {
-		void *v = kmap(page);
-		clear_page(v);
-		kunmap(v);
-	} else {
-		void *v = page_address(page);
-		clear_page(v);
-	}
+	clear_highpage(page);
 #endif
 }