Changeset 63028 in vbox for trunk/src

Timestamp:

Aug 5, 2016 8:18:34 AM (9 years ago)

Author:

vboxsync

Message:

bugref:4567: Linux kernel driver maintenance: the macro cpu_has_pge has been removed from the kernel headers and replaced by its expansion - boot_cpu_has(X86_FEATURE_PGE) - in all calling sites. This expansion seems to have stayed unchanged since kernel 2.5.18 from a check in lxr, and to be valid for recent 2.4 series kernels too. So make the same change in our sources too. This only affects 32-bit hosts and guests. A 32-bit host user has volunteered to test this with Linux 4.7.

File:

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

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

@@ -257 +257 @@
 # ifdef __PAGE_KERNEL_EXEC
    /* >= 2.6.27 */
-#  define MY_PAGE_KERNEL_EXEC   __pgprot(cpu_has_pge ? __PAGE_KERNEL_EXEC | _PAGE_GLOBAL : __PAGE_KERNEL_EXEC)
+#  define MY_PAGE_KERNEL_EXEC   __pgprot(boot_cpu_has(X86_FEATURE_PGE) ? __PAGE_KERNEL_EXEC | _PAGE_GLOBAL : __PAGE_KERNEL_EXEC)
 # else
-#  define MY_PAGE_KERNEL_EXEC   __pgprot(cpu_has_pge ? _PAGE_KERNEL_EXEC | _PAGE_GLOBAL : _PAGE_KERNEL_EXEC)
+#  define MY_PAGE_KERNEL_EXEC   __pgprot(boot_cpu_has(X86_FEATURE_PGE) ? _PAGE_KERNEL_EXEC | _PAGE_GLOBAL : _PAGE_KERNEL_EXEC)
 # endif
 #else