Wed Aug 24 19:55:35 2011 UTC ()

make room for a small msgbuf


(jmcneill)

diff -r1.15 -r1.16 src/sys/arch/usermode/dev/cpu.c

--- src/sys/arch/usermode/dev/cpu.c 2011/08/13 14:06:54	1.15
+++ src/sys/arch/usermode/dev/cpu.c 2011/08/24 19:55:35	1.16

 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu.c,v 1.15 2011/08/13 14:06:54 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.16 2011/08/24 19:55:35 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,37 +17,38 @@
  * ``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.15 2011/08/13 14:06:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.16 2011/08/24 19:55:35 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>
 #include <machine/cpu.h>
 #include <machine/mainbus.h>
 #include <machine/pcb.h>
 #include <machine/thunk.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_page.h>
 /* #define CPU_DEBUG */
 @@ -59,26 +60,27 @@ struct cpu_info cpu_info_primary = {
 	.ci_self = &cpu_info_primary,
 	.ci_idepth = -1,
 	.ci_curlwp = &lwp0,
 };
 char cpu_model[48] = "virtual processor";
 typedef struct cpu_softc {
 	device_t	sc_dev;
 	struct cpu_info	*sc_ci;
 } cpu_softc_t;
 static struct pcb lwp0pcb;
 static void *msgbuf;
 CFATTACH_DECL_NEW(cpu, sizeof(cpu_softc_t), cpu_match, cpu_attach, NULL, NULL);
 static int
 cpu_match(device_t parent, cfdata_t match, void *opaque)
+{
 	struct thunkbus_attach_args *taa = opaque;
 	if (taa->taa_type != THUNKBUS_TYPE_CPU)
 		return 0;
 	return 1;
+}
 @@ -301,26 +303,32 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
 	pcb->pcb_ucp.uc_flags = _UC_STACK | _UC_CPU;
 	thunk_makecontext(&pcb->pcb_ucp, (void (*)(void))cpu_lwp_trampoline,
 , func, arg);
+}
 void
 cpu_initclocks(void)
+{
+}
 void
 cpu_startup(void)
+{
 	msgbuf = thunk_malloc(PAGE_SIZE);
 	if (msgbuf == NULL)
 		panic("couldn't allocate msgbuf");
 	initmsgbuf(msgbuf, PAGE_SIZE);
 	banner();
 	memset(&lwp0pcb, 0, sizeof(lwp0pcb));
 	if (thunk_getcontext(&lwp0pcb.pcb_ucp))
 		panic("getcontext failed");
 	uvm_lwp_setuarea(&lwp0, (vaddr_t)&lwp0pcb);
+}
 void
 cpu_rootconf(void)
+{
 	device_t rdev;