Changeset 7531 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Mar 25, 2008 11:02:24 AM (17 years ago)

Author:

vboxsync

Message:

vboxdrv: set_pages_attr is not available for 2.6.25 anymore

Location:

trunk/src/VBox/Runtime/r0drv/linux

Files:

• alloc-r0drv-linux.c (modified) (2 diffs)
• memobj-r0drv-linux.c (modified) (2 diffs)
• the-linux-kernel.h (modified) (1 diff)

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

@@ -258 +258 @@
             SetPageReserved(&paPages[iPage]);
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */
-            if (pgprot_val(MY_PAGE_KERNEL_EXEC) != pgprot_val(PAGE_KERNEL))
-                MY_CHANGE_PAGE_ATTR(&paPages[iPage], 1, MY_PAGE_KERNEL_EXEC);
+            MY_SET_PAGES_EXEC(&paPages[iPage], 1);
 #endif
         }
@@ -302 +301 @@
             ClearPageReserved(&paPages[iPage]);
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */
-            if (pgprot_val(MY_PAGE_KERNEL_EXEC) != pgprot_val(PAGE_KERNEL))
-                MY_CHANGE_PAGE_ATTR(&paPages[iPage], 1, PAGE_KERNEL);
+            MY_SET_PAGES_NOEXEC(&paPages[iPage], 1);
 #endif
         }

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

@@ -220 +220 @@
     {
         pMemLnx->apPages[iPage] = &paPages[iPage];
-        if (pgprot_val(MY_PAGE_KERNEL_EXEC) != pgprot_val(PAGE_KERNEL))
-            MY_CHANGE_PAGE_ATTR(pMemLnx->apPages[iPage], 1, MY_PAGE_KERNEL_EXEC);
+        MY_SET_PAGES_EXEC(pMemLnx->apPages[iPage], 1);
         if (PageHighMem(pMemLnx->apPages[iPage]))
             BUG();
@@ -261 +260 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22)
 #else
-            if (pgprot_val(MY_PAGE_KERNEL_EXEC) != pgprot_val(PAGE_KERNEL))
-                MY_CHANGE_PAGE_ATTR(pMemLnx->apPages[iPage], 1, PAGE_KERNEL);
+            MY_SET_PAGES_NOEXEC(pMemLnx->apPages[iPage]);
 #endif
         }

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -208 +208 @@
 #endif /* !NO_REDHAT_HACKS */
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+# define MY_SET_PAGES_EXEC(pPages, cPages)    set_pages_x(pPages, cPages)
+# define MY_SET_PAGES_NOEXEC(pPages, cPages)  set_pages_nx(pPages, cPages)
+#else
+# define MY_SET_PAGES_EXEC(pPages, cPages)    MY_CHANGE_PAGE_ATTR(pPages, cPages, MY_PAGE_KERNEL_EXEC)
+# define MY_SET_PAGES_NOEXEC(pPages, cPages)  MY_CHANGE_PAGE_ATTR(pPages, cPages, PAGE_KERNEL)
+#endif
 
 #ifndef MY_DO_MUNMAP