From ebb7e99ab7682a5b810bfe737738f98ebb91c0dc Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Fri, 11 Feb 2011 14:48:45 -0800
Subject: [PATCH] --- yaml --- r: 236027 b: refs/heads/master c:
 d97ae00ea6a632bd97b99431db87d9b505b633a1 h: refs/heads/master i:   236025:
 52054e011d0c4f463948e34abfc4407cdd9baf90   236023:
 3ab61522fc27530fe28ff0fe0c14d53b5a3b391d v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/staging/hv/hv.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5a23eb8d1ba7..b283e0753cc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3fe0bb65b2686aa83dabdb1ecc22f5d80c536f8
+refs/heads/master: d97ae00ea6a632bd97b99431db87d9b505b633a1
diff --git a/trunk/drivers/staging/hv/hv.c b/trunk/drivers/staging/hv/hv.c
index 31b90736bc04..2d492adb95bb 100644
--- a/trunk/drivers/staging/hv/hv.c
+++ b/trunk/drivers/staging/hv/hv.c
@@ -230,12 +230,7 @@ int hv_init(void)
 	* Allocate the hypercall page memory
 	* virtaddr = osd_page_alloc(1);
 	*/
-#ifdef __x86_64__
 	virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
-#else
-	virtaddr =  __vmalloc(PAGE_SIZE, GFP_KERNEL,
-			__pgprot(__PAGE_KERNEL & (~_PAGE_NX)));
-#endif
 
 	if (!virtaddr) {
 		DPRINT_ERR(VMBUS,