From: K. Y. Srinivasan <kys@microsoft.com>
Date: Fri, 11 Feb 2011 22:48:45 +0000 (-0800)
Subject: Staging: hv: Cleanup vmalloc calls
X-Git-Tag: MMI-PSA29.97-13-9~20521^2~518
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d97ae00ea6a632bd97b99431db87d9b505b633a1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: hv: Cleanup vmalloc calls

The subject says it all. There is no need to
specify different page protection bits based
on the architecture.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
index 31b90736bc04..2d492adb95bb 100644
--- a/drivers/staging/hv/hv.c
+++ b/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,