diff options
| author | decke <decke@FreeBSD.org> | 2011-07-01 21:21:51 +0800 |
|---|---|---|
| committer | decke <decke@FreeBSD.org> | 2011-07-01 21:21:51 +0800 |
| commit | f99deaaa5e72a56fcd6bd625efb41a4c3b665131 (patch) | |
| tree | 0463eff3f6b5d9e5bc56ae85e80eaaf25b5c2f4a /emulators | |
| parent | a778dfd8f802e2c0442eac4f56328824f64b9aac (diff) | |
| download | freebsd-ports-gnome-f99deaaa5e72a56fcd6bd625efb41a4c3b665131.tar.gz freebsd-ports-gnome-f99deaaa5e72a56fcd6bd625efb41a4c3b665131.tar.zst freebsd-ports-gnome-f99deaaa5e72a56fcd6bd625efb41a4c3b665131.zip | |
- Fix kmod build on 9-CURRENT after removal of cpumask_t
- Bump PORTREVISION
Submitted by: Jung-uk Kim <jkim@FreeBSD.org>
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/virtualbox-ose-kmod-legacy/Makefile | 2 | ||||
| -rw-r--r-- | emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-mp-r0drv-freebsd.c | 79 |
2 files changed, 80 insertions, 1 deletions
diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile index 3297d0cfe35c..c9564778be53 100644 --- a/emulators/virtualbox-ose-kmod-legacy/Makefile +++ b/emulators/virtualbox-ose-kmod-legacy/Makefile @@ -7,7 +7,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 3.2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-mp-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-mp-r0drv-freebsd.c new file mode 100644 index 000000000000..b089715a27ec --- /dev/null +++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-mp-r0drv-freebsd.c @@ -0,0 +1,79 @@ +--- src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c.orig 2010-12-01 18:09:43.000000000 +0100 ++++ src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c 2011-06-27 16:13:16.000000000 +0200 +@@ -163,17 +163,26 @@ + /* Will panic if no rendezvouing cpus, so check up front. */ + if (RTMpGetOnlineCount() > 1) + { +-#if __FreeBSD_version >= 700000 +- cpumask_t Mask = ~(cpumask_t)curcpu; ++#if __FreeBSD_version >= 900000 ++ cpuset_t Mask; ++#elif __FreeBSD_version >= 700000 ++ cpumask_t Mask; + #endif ++ RTCPUID idCpu = curcpu; + RTMPARGS Args; + + Args.pfnWorker = pfnWorker; + Args.pvUser1 = pvUser1; + Args.pvUser2 = pvUser2; +- Args.idCpu = RTMpCpuId(); ++ Args.idCpu = idCpu; + Args.cHits = 0; + #if __FreeBSD_version >= 700000 ++ Mask = all_cpus; ++#if __FreeBSD_version >= 900000 ++ CPU_CLR(idCpu, &Mask); ++#else ++ Mask &= ~((cpumask_t)1 << idCpu); ++#endif + smp_rendezvous_cpus(Mask, NULL, rtmpOnOthersFreeBSDWrapper, smp_no_rendevous_barrier, &Args); + #else + smp_rendezvous(NULL, rtmpOnOthersFreeBSDWrapper, NULL, &Args); +@@ -203,8 +212,10 @@ + + RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) + { +-#if __FreeBSD_version >= 700000 +- cpumask_t Mask = 1 << idCpu; ++#if __FreeBSD_version >= 900000 ++ cpuset_t Mask; ++#elif __FreeBSD_version >= 700000 ++ cpumask_t Mask; + #endif + RTMPARGS Args; + +@@ -218,7 +229,11 @@ + Args.idCpu = idCpu; + Args.cHits = 0; + #if __FreeBSD_version >= 700000 ++#if __FreeBSD_version >= 900000 ++ CPU_SETOF(idCpu, &Mask); ++#else + Mask = (cpumask_t)1 << idCpu; ++#endif + smp_rendezvous_cpus(Mask, NULL, rtmpOnSpecificFreeBSDWrapper, smp_no_rendevous_barrier, &Args); + #else + smp_rendezvous(NULL, rtmpOnSpecificFreeBSDWrapper, NULL, &Args); +@@ -242,13 +257,21 @@ + + RTDECL(int) RTMpPokeCpu(RTCPUID idCpu) + { ++#if __FreeBSD_version >= 900000 ++ cpuset_t Mask; ++#else + cpumask_t Mask; ++#endif + + /* Will panic if no rendezvouing cpus, so make sure the cpu is online. */ + if (!RTMpIsCpuOnline(idCpu)) + return VERR_CPU_NOT_FOUND; + ++#if __FreeBSD_version >= 900000 ++ CPU_SETOF(idCpu, &Mask); ++#else + Mask = (cpumask_t)1 << idCpu; ++#endif + smp_rendezvous_cpus(Mask, NULL, rtmpFreeBSDPokeCallback, smp_no_rendevous_barrier, NULL); + + return VINF_SUCCESS; |