Sync with vmware-workstation 17.5.0

1 files changed, 5 insertions, 13 deletions

diff --git a/vmmon.patch b/vmmon.patch
index e913e82f5239..bc76665b5773 100644
--- a/vmmon.patch
+++ b/vmmon.patch
@@ -490,7 +490,7 @@
   *
   * Results:
   *    INVALID_MPN on failure
-@@ -47,230 +46,66 @@
+@@ -47,230 +46,70 @@
   */
  
  static INLINE MPN64
@@ -679,7 +679,11 @@
 +         } else {
 +            pte_t *pte;
 +
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,5,0)
++            pte = pte_offset_kernel(pmd, addr);
++#else
 +            pte = pte_offset_map(pmd, addr);
++#endif
 +            if (pte_present(*pte) == 0) {
 +               pte_unmap(pte);
 +               return INVALID_MPN;
@@ -1875,15 +1879,3 @@
           break;
        }
  
-Patch taken from https://raw.githubusercontent.com/jeffersonchua/linux-6.5.0/main/patch-17.0.2-6.5.0
---- a/vmmon/include/pgtbl.h
-+++ b/vmmon/include/pgtbl.h
-@@ -91,7 +91,7 @@
-          } else {
-             pte_t *pte;
- 
--            pte = pte_offset_map(pmd, addr);
-+            pte = pte_offset_kernel(pmd, addr);
-             if (pte_present(*pte) == 0) {
-                pte_unmap(pte);
-                return INVALID_MPN;