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
 }