 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_interface.c,v 1.18 2008/05/28 11:45:15 ad Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.19 2008/10/15 08:13:17 ad Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -23,27 +23,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
  *	db_interface.c,v 2.4 1991/02/05 17:11:13 mrt (CMU)
  */
 /*
  * Interface to new debugger.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.18 2008/05/28 11:45:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.19 2008/10/15 08:13:17 ad Exp $");
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 @@ -273,27 +273,27 @@ extern void cpu_debug_dump(void); /* XXX
 void
 db_mach_cpu(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
+{
 	struct cpu_info *ci;
 	if (!have_addr) {
 		cpu_debug_dump();
 		return;
+	}
 	if (addr < 0) {
 		db_printf("%ld: CPU out of range\n", addr);
 		return;
+	}
-	ci = cpu_lookup_byindex(addr);
+	ci = cpu_lookup(addr);
 	if (ci == NULL) {
 		db_printf("CPU %ld not configured\n", addr);
 		return;
+	}
 	if (ci != curcpu()) {
 		if (!(ci->ci_flags & CPUF_PAUSE)) {
 			db_printf("CPU %ld not paused\n", addr);
 			return;
+		}
+	}
 	if (ci->ci_ddb_regs == 0) {
 		db_printf("CPU %ld has no saved regs\n", addr);
 		return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_interface.c,v 1.61 2008/05/28 11:45:15 ad Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.62 2008/10/15 08:13:17 ad Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -23,27 +23,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
  *	db_interface.c,v 2.4 1991/02/05 17:11:13 mrt (CMU)
  */
 /*
  * Interface to new debugger.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.61 2008/05/28 11:45:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.62 2008/10/15 08:13:17 ad Exp $");
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/simplelock.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 @@ -349,27 +349,27 @@ db_mach_cpu(
 	db_expr_t	count,
 	const char *	modif)
+{
 	struct cpu_info *ci;
 	if (!have_addr) {
 		cpu_debug_dump();
 		return;
+	}
 	if (addr < 0) {
 		db_printf("%ld: CPU out of range\n", addr);
 		return;
+	}
-	ci = cpu_lookup_byindex(addr);
+	ci = cpu_lookup(addr);
 	if (ci == NULL) {
 		db_printf("CPU %ld not configured\n", addr);
 		return;
+	}
 	if (ci != curcpu()) {
 		if (!(ci->ci_flags & CPUF_PAUSE)) {
 			db_printf("CPU %ld not paused\n", addr);
 			return;
+		}
+	}
 	if (ci->ci_ddb_regs == 0) {
 		db_printf("CPU %ld has no saved regs\n", addr);
 		return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.56 2008/06/03 23:05:01 jmcneill Exp $	*/
+/*	$NetBSD: cpu.c,v 1.57 2008/10/15 08:13:17 ad Exp $	*/
 /*-
  * Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bill Sommerfeld of RedBack Networks Inc, and by Andrew Doran.
+ *
  * 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.
 @@ -52,27 +52,27 @@
  * EXPRESS OR 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 AND 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.56 2008/06/03 23:05:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.57 2008/10/15 08:13:17 ad Exp $");
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 @@ -501,27 +501,27 @@ cpu_init(struct cpu_info *ci)
+	}
+}
 void
 cpu_boot_secondary_processors(void)
+{
 	struct cpu_info *ci;
 	u_long i;
 	/* Now that we know the number of CPUs, patch the text segment. */
 	x86_patch();
 	for (i=0; i < maxcpus; i++) {
-		ci = cpu_lookup_byindex(i);
+		ci = cpu_lookup(i);
 		if (ci == NULL)
 			continue;
 		if (ci->ci_data.cpu_idlelwp == NULL)
 			continue;
 		if ((ci->ci_flags & CPUF_PRESENT) == 0)
 			continue;
 		if (ci->ci_flags & (CPUF_BSP|CPUF_SP|CPUF_PRIMARY))
 			continue;
 		cpu_boot_secondary(ci);
+	}
 	x86_mp_online = true;
 @@ -538,27 +538,27 @@ cpu_init_idle_lwp(struct cpu_info *ci)
 	struct lwp *l = ci->ci_data.cpu_idlelwp;
 	struct pcb *pcb = &l->l_addr->u_pcb;
 	pcb->pcb_cr0 = rcr0();
+}
 void
 cpu_init_idle_lwps(void)
+{
 	struct cpu_info *ci;
 	u_long i;
 	for (i = 0; i < maxcpus; i++) {
-		ci = cpu_lookup_byindex(i);
+		ci = cpu_lookup(i);
 		if (ci == NULL)
 			continue;
 		if (ci->ci_data.cpu_idlelwp == NULL)
 			continue;
 		if ((ci->ci_flags & CPUF_PRESENT) == 0)
 			continue;
 		cpu_init_idle_lwp(ci);
+	}
+}
 void
 cpu_start_secondary(struct cpu_info *ci)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_cpu.c,v 1.35 2008/08/28 06:18:26 yamt Exp $	*/
+/*	$NetBSD: kern_cpu.c,v 1.36 2008/10/15 08:13:17 ad Exp $	*/
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -47,27 +47,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.35 2008/08/28 06:18:26 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.36 2008/10/15 08:13:17 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/idle.h>
 #include <sys/sched.h>
 #include <sys/intr.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/cpuio.h>
 #include <sys/proc.h>
 #include <sys/percpu.h>
 #include <sys/kernel.h>
 #include <sys/kauth.h>
 @@ -155,43 +155,45 @@ cpuctl_ioctl(dev_t dev, u_long cmd, void
 	u_int id;
 	error = 0;
 	mutex_enter(&cpu_lock);
 	switch (cmd) {
 	case IOC_CPU_SETSTATE:
 		cs = data;
 		error = kauth_authorize_system(l->l_cred,
 		    KAUTH_SYSTEM_CPU, KAUTH_REQ_SYSTEM_CPU_SETSTATE, cs, NULL,
 		    NULL);
 		if (error != 0)
 			break;
-		if ((ci = cpu_lookup(cs->cs_id)) == NULL) {
+		if (cs->cs_id >= __arraycount(cpu_infos) ||
 		    (ci = cpu_lookup(cs->cs_id)) == NULL) {
 			error = ESRCH;
 			break;
+		}
 		if (!cs->cs_intr) {
 			error = EOPNOTSUPP;
 			break;
+		}
 		error = cpu_setonline(ci, cs->cs_online);
 		break;
 	case IOC_CPU_GETSTATE:
 		cs = data;
 		id = cs->cs_id;
 		memset(cs, 0, sizeof(*cs));
 		cs->cs_id = id;
-		if ((ci = cpu_lookup(id)) == NULL) {
+		if (cs->cs_id >= __arraycount(cpu_infos) ||
 		    (ci = cpu_lookup(id)) == NULL) {
 			error = ESRCH;
 			break;
+		}
 		if ((ci->ci_schedstate.spc_flags & SPCF_OFFLINE) != 0)
 			cs->cs_online = false;
 		else
 			cs->cs_online = true;
 		cs->cs_intr = true;
 		cs->cs_lastmod = ci->ci_schedstate.spc_lastmod;
 		break;
 	case IOC_CPU_MAPID:
 		i = 0;
 @@ -209,45 +211,31 @@ cpuctl_ioctl(dev_t dev, u_long cmd, void
 		*(int *)data = ncpu;
 		break;
 	default:
 		error = ENOTTY;
 		break;
+	}
 	mutex_exit(&cpu_lock);
 	return error;
+}
 struct cpu_info *
-cpu_lookup(cpuid_t id)
+cpu_lookup(u_int idx)
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci;
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		if (ci->ci_cpuid == id)
 			return ci;
 	return NULL;
 struct cpu_info *
 cpu_lookup_byindex(u_int idx)
+{
 	struct cpu_info *ci = cpu_infos[idx];
-	KASSERT(idx < MAXCPUS);
+	KASSERT(idx < __arraycount(cpu_infos));
 	KASSERT(ci == NULL || cpu_index(ci) == idx);
 	return ci;
+}
 static void
 cpu_xc_offline(struct cpu_info *ci)
+{
 	struct schedstate_percpu *spc, *mspc = NULL;
 	struct cpu_info *mci;
 	struct lwp *l;
 	CPU_INFO_ITERATOR cii;
 	int s;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_pool.c,v 1.169 2008/08/11 02:48:42 yamt Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.170 2008/10/15 08:13:17 ad Exp $	*/
 /*-
  * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg; by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center, and by Andrew Doran.
+ *
  * 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
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR 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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.169 2008/08/11 02:48:42 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.170 2008/10/15 08:13:17 ad Exp $");
 #include "opt_ddb.h"
 #include "opt_pool.h"
 #include "opt_poollog.h"
 #include "opt_lockdebug.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bitops.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 @@ -2972,27 +2972,27 @@ found:
 					incache = true;
 					goto print;
+				}
+			}
 			for (i = 0; i < MAXCPUS; i++) {
 				pool_cache_cpu_t *cc;
 				if ((cc = pc->pc_cpus[i]) == NULL) {
 					continue;
+				}
 				if (pool_in_cg(pp, cc->cc_current, addr) ||
 				    pool_in_cg(pp, cc->cc_previous, addr)) {
 					struct cpu_info *ci =
-					    cpu_lookup_byindex(i);
+					    cpu_lookup(i);
 					incpucache = true;
 					snprintf(cpucachestr,
 					    sizeof(cpucachestr),
 					    "cached by CPU %u",
 					    ci->ci_index);
 					goto print;
+				}
+			}
+		}
 print:
 		item = (uintptr_t)ph->ph_page + ph->ph_off;
 		item = item + rounddown(addr - item, pp->pr_size);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_select.c,v 1.9 2008/06/04 13:02:41 rmind Exp $	*/
+/*	$NetBSD: sys_select.c,v 1.10 2008/10/15 08:13:17 ad Exp $	*/
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -60,27 +60,27 @@
  * 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.
+ *
  *	@(#)sys_generic.c	8.9 (Berkeley) 2/14/95
  */
 /*
  * System calls relating to files.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.9 2008/06/04 13:02:41 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.10 2008/10/15 08:13:17 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/stat.h>
 #include <sys/poll.h>
 @@ -651,27 +651,27 @@ selnotify(struct selinfo *sip, int event
 		if (swapin)
 			uvm_kick_scheduler();
+	}
 	if ((mask = sip->sel_collision) != 0) {
 		/*
 		 * There was a collision (multiple waiters): we must
 		 * inform all potentially interested waiters.
 		 */
 		sip->sel_collision = 0;
 		do {
 			index = ffs(mask) - 1;
 			mask &= ~(1 << index);
-			sc = cpu_lookup_byindex(index)->ci_data.cpu_selcpu;
+			sc = cpu_lookup(index)->ci_data.cpu_selcpu;
 			mutex_spin_enter(&sc->sc_lock);
 			sc->sc_ncoll++;
 			sleepq_wake(&sc->sc_sleepq, sc, (u_int)-1,
 			    &sc->sc_lock);
 		} while (__predict_false(mask != 0));
+	}
+}
 /*
  * Remove an LWP from all objects that it is waiting for.  Concurrency
  * issues:
+ *
  * The object owner's (e.g. device driver) lock is not held here.  Calls

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: misc_stub.c,v 1.12 2008/10/02 19:37:23 pooka Exp $ */	1	/* $NetBSD: misc_stub.c,v 1.13 2008/10/15 08:13:17 ad Exp $ */
2		2
3	/*	3	/*
4	* Copyright (c) 2007 Antti Kantee. All Rights Reserved.	4	* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
5	*	5	*
6	* Development of this software was supported by Google Summer of Code.	6	* Development of this software was supported by Google Summer of Code.
7	*	7	*
8	* Redistribution and use in source and binary forms, with or without	8	* Redistribution and use in source and binary forms, with or without
9	* modification, are permitted provided that the following conditions	9	* modification, are permitted provided that the following conditions
10	* are met:	10	* are met:
11	* 1. Redistributions of source code must retain the above copyright	11	* 1. Redistributions of source code must retain the above copyright
12	* notice, this list of conditions and the following disclaimer.	12	* notice, this list of conditions and the following disclaimer.
13	* 2. Redistributions in binary form must reproduce the above copyright	13	* 2. Redistributions in binary form must reproduce the above copyright
14	* notice, this list of conditions and the following disclaimer in the	14	* notice, this list of conditions and the following disclaimer in the
	@@ -60,26 +60,26 @@ preempt()		@@ -60,26 +60,26 @@ preempt()
60		60
61	/* see yield */	61	/* see yield */
62	return;	62	return;
63	}	63	}
64		64
65	void	65	void
66	knote(struct klist *list, long hint)	66	knote(struct klist *list, long hint)
67	{	67	{
68		68
69	return;	69	return;
70	}	70	}
71		71
72	struct cpu_info *	72	struct cpu_info *
73	cpu_lookup_byindex(u_int index)	73	cpu_lookup(u_int index)
74	{	74	{
75	extern struct cpu_info rump_cpu;	75	extern struct cpu_info rump_cpu;
76		76
77	return &rump_cpu;	77	return &rump_cpu;
78	}	78	}
79		79
80	void	80	void
81	evcnt_attach_dynamic(struct evcnt ev, int type, const struct evcnt parent,	81	evcnt_attach_dynamic(struct evcnt ev, int type, const struct evcnt parent,
82	const char group, const char name)	82	const char group, const char name)
83	{	83	{
84		84
85	}	85	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.h,v 1.22 2008/05/19 17:06:02 ad Exp $	*/
+/*	$NetBSD: cpu.h,v 1.23 2008/10/15 08:13:17 ad Exp $	*/
 /*-
  * Copyright (c) 2007 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -61,28 +61,27 @@ void cpu_need_resched(struct cpu_info *,
 #define	CPU_INFO_FOREACH(cii, ci)	\
     (void)cii, ci = curcpu(); ci != NULL; ci = NULL
 #endif
 #ifndef CPU_IS_PRIMARY
 #define	CPU_IS_PRIMARY(ci)	((void)ci, 1)
 #endif
 #ifdef __HAVE_MD_CPU_OFFLINE
 void	cpu_offline_md(void);
 #endif
 lwp_t	*cpu_switchto(lwp_t *, lwp_t *, bool);
-struct	cpu_info *cpu_lookup(cpuid_t);
+struct	cpu_info *cpu_lookup(u_int);
 struct	cpu_info *cpu_lookup_byindex(u_int);
 int	cpu_setonline(struct cpu_info *, bool);
 bool	cpu_intr_p(void);
 bool	cpu_kpreempt_enter(uintptr_t, int);
 void	cpu_kpreempt_exit(uintptr_t);
 bool	cpu_kpreempt_disabled(void);
 CIRCLEQ_HEAD(cpuqueue, cpu_info);
 extern kmutex_t cpu_lock;
 extern u_int maxcpus;
 extern struct cpuqueue cpu_queue;
 static inline u_int