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,