Changeset 77128 in vbox for trunk/src/VBox

Timestamp:

Feb 1, 2019 4:32:30 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128586

Message:

mp-r0drv-freebsd.cpp: Fix compliation on newer FreeBSD kernels where smp_no_rendezvous_barrier was renamed from smp_no_rendevous_barrier

File:

• trunk/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c (modified) (5 diffs)

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

@@ -37 +37 @@
 #include "r0drv/mp-r0drv.h"
 
+
+#if __FreeBSD_version < 1200028
+# define smp_no_rendezvous_barrier smp_no_rendevous_barrier
+#endif
 
 RTDECL(RTCPUID) RTMpCpuId(void)
@@ -156 +160 @@
     Args.idCpu = NIL_RTCPUID;
     Args.cHits = 0;
-    smp_rendezvous(NULL, rtmpOnAllFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+    smp_rendezvous(NULL, rtmpOnAllFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
     return VINF_SUCCESS;
 }
@@ -195 +199 @@
 #if __FreeBSD_version >= 700000
 # if __FreeBSD_version >= 900000
-    Mask = all_cpus;
-    CPU_CLR(curcpu, &Mask);
+        Mask = all_cpus;
+        CPU_CLR(curcpu, &Mask);
 # else
-    Mask = ~(cpumask_t)curcpu;
+        Mask = ~(cpumask_t)curcpu;
 # endif
-        smp_rendezvous_cpus(Mask, NULL, rtmpOnOthersFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+        smp_rendezvous_cpus(Mask, NULL, rtmpOnOthersFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
 #else
         smp_rendezvous(NULL, rtmpOnOthersFreeBSDWrapper, NULL, &Args);
@@ -251 +255 @@
     Mask = (cpumask_t)1 << idCpu;
 # endif
-    smp_rendezvous_cpus(Mask, NULL, rtmpOnSpecificFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+    smp_rendezvous_cpus(Mask, NULL, rtmpOnSpecificFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
 #else
     smp_rendezvous(NULL, rtmpOnSpecificFreeBSDWrapper, NULL, &Args);
@@ -289 +293 @@
     Mask = (cpumask_t)1 << idCpu;
 # endif
-    smp_rendezvous_cpus(Mask, NULL, rtmpFreeBSDPokeCallback, smp_no_rendevous_barrier, NULL);
+    smp_rendezvous_cpus(Mask, NULL, rtmpFreeBSDPokeCallback, smp_no_rendezvous_barrier, NULL);
 
     return VINF_SUCCESS;