Module Name: src
Committed By: rmind
Date: Sun Sep 16 22:09:34 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: arm32_machdep.c
src/sys/arch/arm/cortex: gic.c
src/sys/arch/xen/x86: x86_xpmap.c
src/sys/kern: subr_kcpuset.c
src/sys/sys: kcpuset.h
Log Message:
Rename kcpuset_copybits() to kcpuset_export_u32() and thus be more specific
about the interface.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/cortex/gic.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/xen/x86/x86_xpmap.c
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/subr_kcpuset.c
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/kcpuset.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.83 src/sys/arch/arm/arm32/arm32_machdep.c:1.84
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.83 Fri Aug 31 23:59:51 2012
+++ src/sys/arch/arm/arm32/arm32_machdep.c Sun Sep 16 22:09:33 2012
@@ -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 @@ void
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
Index: src/sys/arch/arm/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.2 src/sys/arch/arm/cortex/gic.c:1.3
--- src/sys/arch/arm/cortex/gic.c:1.2 Fri Sep 14 03:52:50 2012
+++ src/sys/arch/arm/cortex/gic.c Sun Sep 16 22:09:34 2012
@@ -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 @@ armgic_ipi_send(struct pic_softc *pic, c
}
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);
Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.48 src/sys/arch/xen/x86/x86_xpmap.c:1.49
--- src/sys/arch/xen/x86/x86_xpmap.c:1.48 Tue Aug 21 09:06:02 2012
+++ src/sys/arch/xen/x86/x86_xpmap.c Sun Sep 16 22:09:34 2012
@@ -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 <[email protected]>
@@ -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 @@ xen_mcast_invlpg(vaddr_t va, kcpuset_t *
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 @@ xen_mcast_tlbflush(kcpuset_t *kc)
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();
Index: src/sys/kern/subr_kcpuset.c
diff -u src/sys/kern/subr_kcpuset.c:1.7 src/sys/kern/subr_kcpuset.c:1.8
--- src/sys/kern/subr_kcpuset.c:1.7 Mon Aug 20 22:01:29 2012
+++ src/sys/kern/subr_kcpuset.c Sun Sep 16 22:09:33 2012
@@ -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 @@ kcpuset_copyout(kcpuset_t *kcp, cpuset_t
}
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);
Index: src/sys/sys/kcpuset.h
diff -u src/sys/sys/kcpuset.h:1.7 src/sys/sys/kcpuset.h:1.8
--- src/sys/sys/kcpuset.h:1.7 Mon Aug 20 22:01:30 2012
+++ src/sys/sys/kcpuset.h Sun Sep 16 22:09:33 2012
@@ -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 @@ void kcpuset_unuse(kcpuset_t *, kcpuset
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 *);
@@ -68,6 +67,8 @@ int kcpuset_countset(kcpuset_t *);
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
#endif /* _SYS_KCPUSET_H_ */
