From c0236830b93c49587b9338ff0c2ef280e47f410c Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Wed, 5 Aug 2009 17:42:37 +0800
Subject: [PATCH] --- yaml --- r: 164914 b: refs/heads/master c:
 6c189d8312246af776c2587c233d6afcf3714438 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/lguest/core.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 88d1d2271d66..5abb6f4d68da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb100d78c04ff6053047625d0368d0d4b1d9912a
+refs/heads/master: 6c189d8312246af776c2587c233d6afcf3714438
diff --git a/trunk/drivers/lguest/core.c b/trunk/drivers/lguest/core.c
index 1e2cb846b3c9..8744d24ac6e6 100644
--- a/trunk/drivers/lguest/core.c
+++ b/trunk/drivers/lguest/core.c
@@ -67,12 +67,11 @@ static __init int map_switcher(void)
 	 * so we make sure they're zeroed.
 	 */
 	for (i = 0; i < TOTAL_SWITCHER_PAGES; i++) {
-		unsigned long addr = get_zeroed_page(GFP_KERNEL);
-		if (!addr) {
+		switcher_page[i] = alloc_page(GFP_KERNEL|__GFP_ZERO);
+		if (!switcher_page[i]) {
 			err = -ENOMEM;
 			goto free_some_pages;
 		}
-		switcher_page[i] = virt_to_page(addr);
 	}
 
 	/*