summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Rossi <rossi.f@inwind.it>2020-04-12 21:40:51 +0200
committerFabio Rossi <rossi.f@inwind.it>2020-04-12 21:40:51 +0200
commit8f25a120312a9cf7a3c81060e9da2bc3ec4d6bed (patch)
treedbb86f3660dd6916dcc12ff843bf08dcf3a43ceb /app-emulation/vmware-modules/files/308-5.06-01-ioremap_nocache.patch
parentapp-emulation/vmware-modules: changes for kernel 5.5 (diff)
downloadvmware-8f25a120312a9cf7a3c81060e9da2bc3ec4d6bed.tar.gz
vmware-8f25a120312a9cf7a3c81060e9da2bc3ec4d6bed.tar.bz2
vmware-8f25a120312a9cf7a3c81060e9da2bc3ec4d6bed.zip
app-emulation/vmware-modules: fixes for kernel 5.6
Added patches to face the following upstream commits: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d56c0d45f0e27f814e87a1676b6bdccccbc252e9 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4bdc0d676a643140bdf17dbf7eafedee3d496a3c https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c766d1472c70d25ad475cf56042af1652e792b23 Signed-off-by: Fabio Rossi <rossi.f@inwind.it>
Diffstat (limited to 'app-emulation/vmware-modules/files/308-5.06-01-ioremap_nocache.patch')
-rw-r--r--app-emulation/vmware-modules/files/308-5.06-01-ioremap_nocache.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/app-emulation/vmware-modules/files/308-5.06-01-ioremap_nocache.patch b/app-emulation/vmware-modules/files/308-5.06-01-ioremap_nocache.patch
new file mode 100644
index 0000000..0c9b325
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-5.06-01-ioremap_nocache.patch
@@ -0,0 +1,14 @@
+--- ./vmmon-only/linux/hostif.c 2020-04-11 17:06:49.676687324 +0200
++++ ./vmmon-only/linux/hostif.c.new 2020-04-11 17:24:17.482768853 +0200
+@@ -2335,7 +2335,11 @@
+ volatile void *hostapic;
+
+ ASSERT_ON_COMPILE(APICR_SIZE <= PAGE_SIZE);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+ hostapic = (volatile void *) ioremap_nocache(ma, PAGE_SIZE);
++#else
++ hostapic = (volatile void *) ioremap(ma, PAGE_SIZE);
++#endif
+ if (hostapic) {
+ if ((APIC_VERSIONREG(hostapic) & 0xF0) == 0x10) {
+ vm->hostAPIC.base = (volatile uint32 (*)[4]) hostapic;