Changeset 54663 in vbox for trunk/src

Timestamp:

Mar 6, 2015 10:14:06 AM (10 years ago)

Author:

vboxsync

Message:

IPRT: RTMpOnPair fix for Linux < 2.6.27

File:

• trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c

@@ -377 +377 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
         cpumask_t   DstCpuMask;
+#endif
         RTCPUID     idCpuSelf = RTMpCpuId();
         bool const  fCallSelf = idCpuSelf == idCpu1 || idCpuSelf == idCpu2;
-#endif
         RTMPARGS    Args;
         Args.pfnWorker = pfnWorker;
@@ -406 +406 @@
         rc = smp_call_function_mask(DstCpuMask, rtmpLinuxWrapperPostInc, &Args, !fCallSelf /* wait */);
 #else /* older kernels */
-        rc = smp_call_function(rtMpLinuxOnPairWrapper, &Args, 0 /* retry */, 0 /* wait */);
+        rc = smp_call_function(rtMpLinuxOnPairWrapper, &Args, 0 /* retry */, !fCallSelf /* wait */);
 #endif /* older kernels */
         Assert(rc == 0);
 
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
         /* Call ourselves if necessary and wait for the other party to be done. */
         if (fCallSelf)
@@ -425 +423 @@
             }
         }
-#endif
 
         Assert(Args.cHits <= 2);