Changeset 13665 in vbox

Timestamp:

Oct 29, 2008 5:42:51 PM (16 years ago)

Author:

vboxsync

Message:

rtMemAlloc/linux: Don't fool ourselves trying to allocate executable memory via vmalloc on AMD64, it won't work. Better to fail straight away.

File:

• trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c

@@ -131 +131 @@
         }
         else
-# endif
-            pHdr = (PRTMEMHDR)__vmalloc(cb + sizeof(*pHdr), GFP_KERNEL | __GFP_HIGHMEM, MY_PAGE_KERNEL_EXEC);
+            pHdr = NULL;
+# else  /* !RTMEMALLOC_EXEC_HEAP */
+        pHdr = (PRTMEMHDR)__vmalloc(cb + sizeof(*pHdr), GFP_KERNEL | __GFP_HIGHMEM, MY_PAGE_KERNEL_EXEC);
+# endif /* !RTMEMALLOC_EXEC_HEAP */
 
 #elif defined(PAGE_KERNEL_EXEC) && defined(CONFIG_X86_PAE)