summaryrefslogtreecommitdiffstats
path: root/sys/mips/cavium
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2011-05-13 19:56:58 +0000
committerattilio <attilio@FreeBSD.org>2011-05-13 19:56:58 +0000
commita79fdc81aa4d25507b90e10fedbc38d5ad84ba4a (patch)
treed2889bf496fba4f4f14a81f1881c272545fd637f /sys/mips/cavium
parentdcae8c96267648ce6ae3191f642d5ddd62d0b319 (diff)
downloadFreeBSD-src-a79fdc81aa4d25507b90e10fedbc38d5ad84ba4a.zip
FreeBSD-src-a79fdc81aa4d25507b90e10fedbc38d5ad84ba4a.tar.gz
Fix a brain-o in platform_cpu_mask() by just specifying a possible
cpuset_t to be copied, rather than return the array. I can't rely anymore on this being a simple int/long object. Reported by: art
Diffstat (limited to 'sys/mips/cavium')
-rw-r--r--sys/mips/cavium/octeon_mp.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/mips/cavium/octeon_mp.c b/sys/mips/cavium/octeon_mp.c
index 5e494b8..efddee8 100644
--- a/sys/mips/cavium/octeon_mp.c
+++ b/sys/mips/cavium/octeon_mp.c
@@ -102,20 +102,18 @@ platform_init_ap(int cpuid)
mips_wbflush();
}
-cpuset_t
-platform_cpu_mask(void)
+void
+platform_cpu_mask(cpuset_t *mask)
{
- cpuset_t cpumask;
- CPU_ZERO(&cpumask);
+ CPU_ZERO(mask);
/*
* XXX: hack in order to simplify CPU set building, assuming that
* core_mask is 32-bits.
*/
- memcpy(&cpumask, &octeon_bootinfo->core_mask,
+ memcpy(mask, &octeon_bootinfo->core_mask,
sizeof(octeon_bootinfo->core_mask));
- return (cpumask);
}
struct cpu_group *
OpenPOWER on IntegriCloud