summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-12-22 15:59:11 +0100
committerroot2016-12-22 15:59:11 +0100
commit1f759905b5b5c4f8f967fb851889bba1f5dfbdef (patch)
treee3eb9d3aee882bea1e16c9f56abb9d90b84b88d8
parent[vmware] 12.5.2 (diff)
downloadtm-scripts-1f759905b5b5c4f8f967fb851889bba1f5dfbdef.tar.gz
tm-scripts-1f759905b5b5c4f8f967fb851889bba1f5dfbdef.tar.xz
tm-scripts-1f759905b5b5c4f8f967fb851889bba1f5dfbdef.zip
[vmware] Add patches for 12.x on kernel 4.9
-rw-r--r--remote/modules/vmware/patches/vmmon__4.9__12.0.0-12.5.2.patch13
-rw-r--r--remote/modules/vmware/patches/vmnet__4.9__12.0.0-12.5.2.patch13
2 files changed, 26 insertions, 0 deletions
diff --git a/remote/modules/vmware/patches/vmmon__4.9__12.0.0-12.5.2.patch b/remote/modules/vmware/patches/vmmon__4.9__12.0.0-12.5.2.patch
new file mode 100644
index 00000000..054dd8a1
--- /dev/null
+++ b/remote/modules/vmware/patches/vmmon__4.9__12.0.0-12.5.2.patch
@@ -0,0 +1,13 @@
+--- a/linux/hostif.c 2016-12-22 14:27:00.425933040 +0100
++++ b/linux/hostif.c 2016-12-22 14:27:38.746706220 +0100
+@@ -1162,7 +1162,9 @@
+ int retval;
+
+ down_read(&current->mm->mmap_sem);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++ retval = get_user_pages((unsigned long)uvAddr, numPages, 0, ppages, NULL);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
+ retval = get_user_pages((unsigned long)uvAddr, numPages, 0, 0, ppages, NULL);
+ #else
+ retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
diff --git a/remote/modules/vmware/patches/vmnet__4.9__12.0.0-12.5.2.patch b/remote/modules/vmware/patches/vmnet__4.9__12.0.0-12.5.2.patch
new file mode 100644
index 00000000..18ef062b
--- /dev/null
+++ b/remote/modules/vmware/patches/vmnet__4.9__12.0.0-12.5.2.patch
@@ -0,0 +1,13 @@
+--- a/userif.c 2016-12-22 14:29:43.237218623 +0100
++++ b/userif.c 2016-12-22 14:31:03.258834075 +0100
+@@ -113,7 +113,9 @@
+ int retval;
+
+ down_read(&current->mm->mmap_sem);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++ retval = get_user_pages(addr, 1, 0, &page, NULL);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
+ retval = get_user_pages(addr, 1, 1, 0, &page, NULL);
+ #else
+ retval = get_user_pages(current, current->mm, addr,