[patch] Patch from Comment 2 in File form

compatsmp.patch (text/plain), 2.42 KB, created by Brandon Penglase on 2014-02-07 01:59:14 UTC

diff -ruN work/vmmon-only/linux/driver.c work-new3/vmmon-only/linux/driver.c
--- work/vmmon-only/linux/driver.c	2013-10-18 15:11:55.000000000 -0400
+++ work-new3/vmmon-only/linux/driver.c	2014-02-06 20:49:20.793796883 -0500
@@ -1245,13 +1245,6 @@
    preempt_disable();
 
    /*
-    * Call all other CPUs, but do not wait so we can enter the callback
-    * on this CPU too.
-    */
-
-   compat_smp_call_function(LinuxDriverSyncCallHook, &args, 0);
-
-   /*
     * smp_call_function doesn't return until all cpus have been
     * interrupted.  It's safe to disable interrupts now that all other
     * cpus are in their IPI handlers.
diff -ruN work/vmmon-only/linux/hostif.c work-new3/vmmon-only/linux/hostif.c
--- work/vmmon-only/linux/hostif.c	2014-02-06 20:46:35.531362979 -0500
+++ work-new3/vmmon-only/linux/hostif.c	2014-02-06 20:48:50.593351894 -0500
@@ -2708,21 +2708,12 @@
       if (targetHostCpu != INVALID_PCPU) {
          ASSERT(targetHostCpu < MAX_PCPUS);
 
-#if defined(VMMON_USE_CALL_FUNC)
-         /* older kernels IPI broadcast; use async when possible */
-         (void) compat_smp_call_function(LinuxDriverIPIHandler,
-                                         NULL, VMMON_CALL_FUNC_SYNC);
-
-	 mode = IPI_BROADCAST;
-	 break;
-#else
          /* Newer kernels have (async) IPI targetting */
          arch_send_call_function_single_ipi(targetHostCpu);
 	 mode = IPI_UNICAST;
          if (!all) {
 	    break;
          }
-#endif
       }
       ipiTargets = VCPUSet_Remove(ipiTargets, v);
    }
@@ -2848,7 +2839,7 @@
 {
    preempt_disable();
    (*func)(data);
-   (void)compat_smp_call_function(*func, data, 1);
+   // (void)compat_smp_call_function(*func, data, 1);
    preempt_enable();
 }
 
diff -ruN work/vmmon-only/linux/vmmonInt.h work-new3/vmmon-only/linux/vmmonInt.h
--- work/vmmon-only/linux/vmmonInt.h	2013-10-18 15:11:54.000000000 -0400
+++ work-new3/vmmon-only/linux/vmmonInt.h	2014-02-06 20:51:02.090290113 -0500
@@ -23,17 +23,6 @@
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
 
-
-/*
- * Hide all kernel compatibility stuff in these macros and functions.
- */
-
-#ifdef VMW_HAVE_SMP_CALL_3ARG
-#define compat_smp_call_function(fn, info, wait) smp_call_function(fn, info, wait)
-#else
-#define compat_smp_call_function(fn, info, wait) smp_call_function(fn, info, 1, wait)
-#endif
-
 /*
  * Although this is not really related to kernel-compatibility, I put this
  * helper macro here for now for a lack of better place --hpreg