Changeset 7553 in vbox for trunk/src/VBox/Runtime/r0drv/linux

Timestamp:

Mar 25, 2008 3:13:42 PM (17 years ago)

Author:

vboxsync

Message:

vboxdrv: re-added sanity check

File:

• trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)

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

@@ -208 +208 @@
 #endif /* !NO_REDHAT_HACKS */
 
+#ifndef MY_DO_MUNMAP
+# define MY_DO_MUNMAP(a,b,c) do_munmap(a, b, c)
+#endif
+
+#ifndef MY_CHANGE_PAGE_ATTR
+# ifdef RT_ARCH_AMD64 /** @todo This is a cheap hack, but it'll get around that 'else BUG();' in __change_page_attr().  */
+#  define MY_CHANGE_PAGE_ATTR(pPages, cPages, prot) \
+    do { \
+        change_page_attr(pPages, cPages, PAGE_KERNEL_NOCACHE); \
+        change_page_attr(pPages, cPages, prot); \
+    } while (0)
+# else
+#  define MY_CHANGE_PAGE_ATTR(pPages, cPages, prot) change_page_attr(pPages, cPages, prot)
+# endif
+#endif
+
 #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
-# define MY_DO_MUNMAP(a,b,c) do_munmap(a, b, c)
-#endif
-
-#ifndef MY_CHANGE_PAGE_ATTR
-# ifdef RT_ARCH_AMD64 /** @todo This is a cheap hack, but it'll get around that 'else BUG();' in __change_page_attr().  */
-#  define MY_CHANGE_PAGE_ATTR(pPages, cPages, prot) \
-    do { \
-        change_page_attr(pPages, cPages, PAGE_KERNEL_NOCACHE); \
-        change_page_attr(pPages, cPages, prot); \
-    } while (0)
-# else
-#  define MY_CHANGE_PAGE_ATTR(pPages, cPages, prot) change_page_attr(pPages, cPages, prot)
-# endif
+# define MY_SET_PAGES_EXEC(pPages, cPages) \
+    do { \
+        if (pgprot_val(MY_PAGE_KERNEL_EXEC) != pgprot_val(PAGE_KERNEL)) \
+            MY_CHANGE_PAGE_ATTR(pPages, cPages, MY_PAGE_KERNEL_EXEC) \
+    } while (0)
+# define MY_SET_PAGES_NOEXEC(pPages, cPages) \
+    do { \
+        if (pgprot_val(MY_PAGE_KERNEL_EXEC) != pgprot_val(PAGE_KERNEL)) \
+            MY_CHANGE_PAGE_ATTR(pPages, cPages, PAGE_KERNEL) \
+    } while (0)
 #endif