Ticket #19644: vb-6.0.24-kernel-5.8-p5-1.patch
| File vb-6.0.24-kernel-5.8-p5-1.patch, 1.6 KB (added by , 4 years ago) |
|---|
-
src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
a b static int force_async_tsc = 0; 144 144 * Memory for the executable memory heap (in IPRT). 145 145 */ 146 146 # ifdef DEBUG 147 # define EXEC_MEMORY_SIZE 8388608 /* 8MB */147 # define EXEC_MEMORY_SIZE 10485760 /* 10 MB */ 148 148 # else 149 # define EXEC_MEMORY_SIZE 2097152 /* 2MB */149 # define EXEC_MEMORY_SIZE 8388608 /* 8 MB */ 150 150 # endif 151 151 extern uint8_t g_abExecMemory[EXEC_MEMORY_SIZE]; 152 152 # ifndef VBOX_WITH_TEXT_MODMEM_HACK … … EXPORT_SYMBOL(SUPDrvLinuxIDC); 756 756 757 757 RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask) 758 758 { 759 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) 760 RTCCUINTREG uOld = this_cpu_read(cpu_tlbstate.cr4); 761 RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask; 759 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) 760 RTCCUINTREG const uOld = __read_cr4(); 761 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) 762 RTCCUINTREG const uOld = this_cpu_read(cpu_tlbstate.cr4); 763 #else 764 RTCCUINTREG const uOld = ASMGetCR4(); 765 #endif 766 RTCCUINTREG const uNew = (uOld & fAndMask) | fOrMask; 762 767 if (uNew != uOld) 763 768 { 769 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) 770 ASMSetCR4(uNew); 771 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) 764 772 this_cpu_write(cpu_tlbstate.cr4, uNew); 765 773 __write_cr4(uNew); 766 }767 774 #else 768 RTCCUINTREG uOld = ASMGetCR4();769 RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask;770 if (uNew != uOld)771 775 ASMSetCR4(uNew); 772 776 #endif 777 } 773 778 return uOld; 774 779 } 775 780

