Sun Sep 16 22:09:34 2012 UTC ()
Rename kcpuset_copybits() to kcpuset_export_u32() and thus be more specific
about the interface.
(rmind)
diff -r1.83 -r1.84 src/sys/arch/arm/arm32/arm32_machdep.c
diff -r1.2 -r1.3 src/sys/arch/arm/cortex/gic.c
diff -r1.48 -r1.49 src/sys/arch/xen/x86/x86_xpmap.c
diff -r1.7 -r1.8 src/sys/kern/subr_kcpuset.c
diff -r1.7 -r1.8 src/sys/sys/kcpuset.h
--- src/sys/arch/arm/arm32/arm32_machdep.c 2012/08/31 23:59:51 1.83
+++ src/sys/arch/arm/arm32/arm32_machdep.c 2012/09/16 22:09:33 1.84
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.83 2012/08/31 23:59:51 matt Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.84 2012/09/16 22:09:33 rmind Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.83 2012/08/31 23:59:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.84 2012/09/16 22:09:33 rmind Exp $");
#include "opt_modular.h"
#include "opt_md.h"
@@ -528,7 +528,7 @@
cpu_boot_secondary_processors(void)
{
uint32_t mbox;
- kcpuset_copybits(kcpuset_attached, &mbox, sizeof(mbox));
+ kcpuset_export_u32(kcpuset_attached, &mbox, sizeof(mbox));
atomic_swap_32(&arm_cpu_mbox, mbox);
membar_producer();
#ifdef _ARM_ARCH_7
--- src/sys/arch/arm/cortex/gic.c 2012/09/14 03:52:50 1.2
+++ src/sys/arch/arm/cortex/gic.c 2012/09/16 22:09:34 1.3
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.2 2012/09/14 03:52:50 matt Exp $ */
+/* $NetBSD: gic.c,v 1.3 2012/09/16 22:09:34 rmind Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.2 2012/09/14 03:52:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.3 2012/09/16 22:09:34 rmind Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -437,7 +437,7 @@
}
uint32_t targets;
- kcpuset_copybits(kcp, &targets, sizeof(targets));
+ kcpuset_export_u32(kcp, &targets, sizeof(targets));
uint32_t sgir = __SHIFTOUT(ARMGIC_SGI_IPIBASE + ipi, GICD_SGIR_SGIINTID);
sgir |= __SHIFTOUT(targets, GICD_SGIR_TargetList);
--- src/sys/arch/xen/x86/x86_xpmap.c 2012/08/21 09:06:02 1.48
+++ src/sys/arch/xen/x86/x86_xpmap.c 2012/09/16 22:09:34 1.49
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.48 2012/08/21 09:06:02 bouyer Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.49 2012/09/16 22:09:34 rmind Exp $ */
/*
* Copyright (c) 2006 Mathieu Ropert <mro@adviseo.fr>
@@ -69,7 +69,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.48 2012/08/21 09:06:02 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.49 2012/09/16 22:09:34 rmind Exp $");
#include "opt_xen.h"
#include "opt_ddb.h"
@@ -380,7 +380,7 @@
xcpumask_t xcpumask;
mmuext_op_t op;
- kcpuset_copybits(kc, &xcpumask.xcpum_km[0], sizeof(xcpumask));
+ kcpuset_export_u32(kc, &xcpumask.xcpum_km[0], sizeof(xcpumask));
/* Flush pending page updates */
xpq_flush_queue();
@@ -421,7 +421,7 @@
xcpumask_t xcpumask;
mmuext_op_t op;
- kcpuset_copybits(kc, &xcpumask.xcpum_km[0], sizeof(xcpumask));
+ kcpuset_export_u32(kc, &xcpumask.xcpum_km[0], sizeof(xcpumask));
/* Flush pending page updates */
xpq_flush_queue();
--- src/sys/kern/subr_kcpuset.c 2012/08/20 22:01:29 1.7
+++ src/sys/kern/subr_kcpuset.c 2012/09/16 22:09:33 1.8
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kcpuset.c,v 1.7 2012/08/20 22:01:29 rmind Exp $ */
+/* $NetBSD: subr_kcpuset.c,v 1.8 2012/09/16 22:09:33 rmind Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kcpuset.c,v 1.7 2012/08/20 22:01:29 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kcpuset.c,v 1.8 2012/09/16 22:09:33 rmind Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -302,7 +302,7 @@
}
void
-kcpuset_copybits(const kcpuset_t *kcp, uint32_t *bitfield, size_t len)
+kcpuset_export_u32(const kcpuset_t *kcp, uint32_t *bitfield, size_t len)
{
size_t rlen = MIN(kc_bitsize, len);
--- src/sys/sys/kcpuset.h 2012/08/20 22:01:30 1.7
+++ src/sys/sys/kcpuset.h 2012/09/16 22:09:33 1.8
@@ -1,4 +1,4 @@
-/* $NetBSD: kcpuset.h,v 1.7 2012/08/20 22:01:30 rmind Exp $ */
+/* $NetBSD: kcpuset.h,v 1.8 2012/09/16 22:09:33 rmind Exp $ */
/*-
* Copyright (c) 2008, 2011 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
int kcpuset_copyin(const cpuset_t *, kcpuset_t *, size_t);
int kcpuset_copyout(kcpuset_t *, cpuset_t *, size_t);
-void kcpuset_copybits(const kcpuset_t *, uint32_t *, size_t);
void kcpuset_zero(kcpuset_t *);
void kcpuset_fill(kcpuset_t *);
@@ -67,6 +66,8 @@
void kcpuset_atomic_set(kcpuset_t *, cpuid_t);
void kcpuset_atomic_clear(kcpuset_t *, cpuid_t);
+
+void kcpuset_export_u32(const kcpuset_t *, uint32_t *, size_t);
#endif