Module Name: src
Committed By: matt
Date: Wed Dec 16 19:01:24 UTC 2009
Modified Files:
src/sys/arch/cobalt/cobalt: machdep.c
src/sys/arch/cobalt/stand/boot: boot.c
Log Message:
Make cobalt build again.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/cobalt/cobalt/machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cobalt/stand/boot/boot.c
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/cobalt/cobalt/machdep.c
diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.105 src/sys/arch/cobalt/cobalt/machdep.c:1.106
--- src/sys/arch/cobalt/cobalt/machdep.c:1.105 Mon Dec 14 00:46:00 2009
+++ src/sys/arch/cobalt/cobalt/machdep.c Wed Dec 16 19:01:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.105 2009/12/14 00:46:00 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.106 2009/12/16 19:01:24 matt Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.105 2009/12/14 00:46:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.106 2009/12/16 19:01:24 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -147,8 +147,6 @@
{
char *kernend;
u_long first, last;
- struct pcb *pcb0;
- vaddr_t v;
extern char edata[], end[];
const char *bi_msg;
#if NKSYMS || defined(DDB) || defined(MODULAR)
Index: src/sys/arch/cobalt/stand/boot/boot.c
diff -u src/sys/arch/cobalt/stand/boot/boot.c:1.17 src/sys/arch/cobalt/stand/boot/boot.c:1.18
--- src/sys/arch/cobalt/stand/boot/boot.c:1.17 Thu May 29 14:25:00 2008
+++ src/sys/arch/cobalt/stand/boot/boot.c Wed Dec 16 19:01:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.17 2008/05/29 14:25:00 tsutsui Exp $ */
+/* $NetBSD: boot.c,v 1.18 2009/12/16 19:01:24 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -379,7 +379,7 @@
bootprog_name, bootprog_rev, (void*)&start);
printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
printf(">> Model:\t\t%s\n", cobalt_model[cobalt_id]);
- printf(">> Memory:\t\t%u k\n", (memsize - MIPS_KSEG0_START) / 1024);
+ printf(">> Memory:\t\t%lu k\n", (memsize - MIPS_KSEG0_START) / 1024);
printf(">> PROM boot string:\t%s\n", bootstring);
}
