 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -32,27 +32,27 @@
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * Machine dependent functions for kernel setup
+ *
  * Created      : 17/09/94
  * Updated	: 18/04/01 updated for new wscons
  */
 #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"
 #include "opt_pmap_debug.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 @@ -518,27 +518,27 @@ vaddr_t
 cpu_uarea_alloc_idlelwp(struct cpu_info *ci)
+{
 	const vaddr_t va = idlestack.pv_va + ci->ci_cpuid * USPACE;
 	// printf("%s: %s: va=%lx\n", __func__, ci->ci_data.cpu_name, va);
 	return va;
+}
 #endif
 #ifdef MULTIPROCESSOR
 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
 	__asm __volatile("sev; sev; sev");
 #endif
+}
 void
 xc_send_ipi(struct cpu_info *ci)
+{
 	KASSERT(kpreempt_disabled());
 	KASSERT(curcpu() != ci);

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -21,27 +21,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/device.h>
 #include <sys/evcnt.h>
 #include <sys/intr.h>
 #include <sys/proc.h>
 #include <sys/xcall.h>		/* for xc_ipi_handler */
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
 #include <arm/atomic.h>
 @@ -427,27 +427,27 @@ armgic_cpu_init(struct pic_softc *pic, s
+}
 void
 armgic_ipi_send(struct pic_softc *pic, const kcpuset_t *kcp, u_long ipi)
+{
 	struct armgic_softc * const sc = PICTOSOFTC(pic);
 	if (ipi == IPI_NOP) {
 		__asm __volatile("sev");
 		return;
+	}
 	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);
 	printf("%s: %s: %#x", __func__, curcpu()->ci_data.cpu_name, sgir);
 	gicd_write(sc, GICD_SGIR, sgir);
 	printf("\n");
+}
 #endif
 int
 armgic_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mpcore_attach_args * const mpcaa = aux;

 @@ -1,14 +1,14 @@
-/*	$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>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 @@ -59,27 +59,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include "ksyms.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mutex.h>
 #include <sys/cpu.h>
 #include <uvm/uvm.h>
 #include <x86/pmap.h>
 @@ -370,27 +370,27 @@ xpq_queue_invlpg(vaddr_t va)
 	XENPRINTK2(("xpq_queue_invlpg %#" PRIxVADDR "\n", va));
 	op.cmd = MMUEXT_INVLPG_LOCAL;
 	op.arg1.linear_addr = (va & ~PAGE_MASK);
 	if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0)
 		panic("xpq_queue_invlpg");
+}
 void
 xen_mcast_invlpg(vaddr_t va, 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();
 	op.cmd = MMUEXT_INVLPG_MULTI;
 	op.arg1.linear_addr = va;
 	op.arg2.vcpumask = &xcpumask.xcpum_xm;
 	if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0) {
 		panic("xpq_queue_invlpg_all");
+	}
 	return;
 @@ -411,27 +411,27 @@ xen_bcast_invlpg(vaddr_t va)
 		panic("xpq_queue_invlpg_all");
+	}
 	return;
+}
 /* This is a synchronous call. */
 void
 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();
 	op.cmd = MMUEXT_TLB_FLUSH_MULTI;
 	op.arg2.vcpumask = &xcpumask.xcpum_xm;
 	if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0) {
 		panic("xpq_queue_invlpg_all");
+	}
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -31,27 +31,27 @@
 /*
  * Kernel CPU set implementation.
+ *
  * Interface can be used by kernel subsystems as a unified dynamic CPU
  * bitset implementation handling many CPUs.  Facility also supports early
  * use by MD code on boot, as it fixups bitsets on further boot.
+ *
  * TODO:
  * - Handle "reverse" bitset on fixup/grow.
  */
 #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>
 #include <sys/atomic.h>
 #include <sys/sched.h>
 #include <sys/kcpuset.h>
 #include <sys/pool.h>
 /* Number of CPUs to support. */
 #define	KC_MAXCPUS		roundup2(MAXCPUS, 32)
 /*
 @@ -292,27 +292,27 @@ kcpuset_copyout(kcpuset_t *kcp, cpuset_t
 	kcpuset_impl_t *kc __unused = KC_GETSTRUCT(kcp);
 	KASSERT(kc_initialised);
 	KASSERT(kc->kc_refcnt > 0);
 	KASSERT(kc->kc_next == NULL);
 	if (len > kc_bitsize) { /* XXX */
 		return EINVAL;
+	}
 	return copyout(kcp, ucp, len);
+}
 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);
 	KASSERT(kcp != NULL);
 	memcpy(bitfield, kcp->bits, rlen);
+}
 /*
  * Routines to change bit field - zero, fill, copy, set, unset, etc.
  */
 void
 kcpuset_zero(kcpuset_t *kcp)

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas and Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -40,34 +40,35 @@ typedef struct kcpuset	kcpuset_t;
 #include <sys/sched.h>
 void		kcpuset_sysinit(void);
 void		kcpuset_create(kcpuset_t **, bool);
 void		kcpuset_destroy(kcpuset_t *);
 void		kcpuset_copy(kcpuset_t *, kcpuset_t *);
 void		kcpuset_use(kcpuset_t *);
 void		kcpuset_unuse(kcpuset_t *, kcpuset_t **);
 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 *);
 void		kcpuset_set(kcpuset_t *, cpuid_t);
 void		kcpuset_clear(kcpuset_t *, cpuid_t);
 bool		kcpuset_isset(kcpuset_t *, cpuid_t);
 bool		kcpuset_isotherset(kcpuset_t *, cpuid_t);
 bool		kcpuset_iszero(kcpuset_t *);
 bool		kcpuset_match(const kcpuset_t *, const kcpuset_t *);
 void		kcpuset_merge(kcpuset_t *, kcpuset_t *);
 void		kcpuset_intersect(kcpuset_t *, kcpuset_t *);
 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_ */