 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu.c,v 1.16 2011/08/24 19:55:35 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.17 2011/08/27 20:49:36 jmcneill Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -17,27 +17,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: cpu.c,v 1.16 2011/08/24 19:55:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.17 2011/08/27 20:49:36 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/lwp.h>
 #include <sys/cpu.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <dev/cons.h>
 @@ -146,29 +146,33 @@ void
 cpu_need_proftick(struct lwp *l)
+{
+}
 lwp_t *
 cpu_switchto(lwp_t *oldlwp, lwp_t *newlwp, bool returning)
+{
 	extern int errno;
 	struct pcb *oldpcb = oldlwp ? lwp_getpcb(oldlwp) : NULL;
 	struct pcb *newpcb = lwp_getpcb(newlwp);
 	struct cpu_info *ci = curcpu();
 #ifdef CPU_DEBUG
-	printf("cpu_switchto [%s] -> [%s]\n",
+	printf("cpu_switchto [%s,pid=%d,lid=%d] -> [%s,pid=%d,lid=%d]\n",
 	    oldlwp ? oldlwp->l_name : "none",
-	    newlwp ? newlwp->l_name : "none");
+	    oldlwp ? oldlwp->l_proc->p_pid : -1,
 	    oldlwp ? oldlwp->l_lid : -1,
 	    newlwp ? newlwp->l_name : "none",
 	    newlwp ? newlwp->l_proc->p_pid : -1,
 	    newlwp ? newlwp->l_lid : -1);
 	if (oldpcb) {
 		printf("    oldpcb uc_link=%p, uc_stack.ss_sp=%p, "
 		    "uc_stack.ss_size=%d\n",
 		    oldpcb->pcb_ucp.uc_link,
 		    oldpcb->pcb_ucp.uc_stack.ss_sp,
 		    (int)oldpcb->pcb_ucp.uc_stack.ss_size);
+	}
 	if (newpcb) {
 		printf("    newpcb uc_link=%p, uc_stack.ss_sp=%p, "
 		    "uc_stack.ss_size=%d\n",
 		    newpcb->pcb_ucp.uc_link,
 		    newpcb->pcb_ucp.uc_stack.ss_sp,
 		    (int)newpcb->pcb_ucp.uc_stack.ss_size);
 @@ -192,29 +196,26 @@ cpu_switchto(lwp_t *oldlwp, lwp_t *newlw
+}
 void
 cpu_dumpconf(void)
+{
 #ifdef CPU_DEBUG
 	printf("cpu_dumpconf\n");
 #endif
+}
 void
 cpu_signotify(struct lwp *l)
+{
 #ifdef CPU_DEBUG
 	printf("cpu_signotify\n");
 #endif
+}
 void
 cpu_getmcontext(struct lwp *l, mcontext_t *mcp, unsigned int *flags)
+{
 #ifdef CPU_DEBUG
 	printf("cpu_getmcontext\n");
 #endif
+}
 int
 cpu_setmcontext(struct lwp *l, const mcontext_t *mcp, unsigned int flags)
+{