---

yaml --- r: 236027 b: refs/heads/master c: d97ae00 h: refs/heads/master i: 236025: 52054e0 236023: 3ab6152 v: v3
git-mirror · Feb 18, 2011 · ebb7e99 · ebb7e99
1 parent c267017
commit ebb7e99
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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,