diff options
Diffstat (limited to 'vmmon.patch')
| -rw-r--r-- | vmmon.patch | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/vmmon.patch b/vmmon.patch index fe1231c1704e..1346e2e979b7 100644 --- a/vmmon.patch +++ b/vmmon.patch @@ -1,5 +1,5 @@ diff --git a/vmmon/linux/driver.c b/vmmon/linux/driver.c -index 0a72335..63cea5d 100644 +index 87cf45b..6e90af4 100644 --- a/vmmon/linux/driver.c +++ b/vmmon/linux/driver.c @@ -1279,7 +1279,7 @@ LinuxDriverReadTSC(void *data, // OUT: TSC values @@ -12,7 +12,7 @@ index 0a72335..63cea5d 100644 { TSCDelta tscDelta; diff --git a/vmmon/linux/hostif.c b/vmmon/linux/hostif.c -index d1bc8ba..4d5018b 100644 +index 7053a83..a4a4eb2 100644 --- a/vmmon/linux/hostif.c +++ b/vmmon/linux/hostif.c @@ -74,6 +74,7 @@ @@ -23,18 +23,6 @@ index d1bc8ba..4d5018b 100644 #include "vmware.h" #include "x86apic.h" -@@ -1162,7 +1163,11 @@ HostIFGetUserPages(void *uvAddr, // IN - int retval; - - down_read(¤t->mm->mmap_sem); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+ retval = get_user_pages((unsigned long)uvAddr, -+#else - retval = get_user_pages(current, current->mm, (unsigned long)uvAddr, -+#endif - numPages, 0, 0, ppages, NULL); - up_read(¤t->mm->mmap_sem); - diff --git a/vmmon/linux/vmmonInt.h b/vmmon/linux/vmmonInt.h index 4dc04e9..993212d 100644 --- a/vmmon/linux/vmmonInt.h |