Module Name: src
Committed By: ad
Date: Sun Mar 29 10:58:54 UTC 2009
Modified Files:
src/sys/arch/i386/i386: machdep.c
Log Message:
Make i386 use banner(). amd64 not converted yet as it seems to trip into
a bug in format_bytes().
To generate a diff of this commit:
cvs rdiff -u -r1.666 -r1.667 src/sys/arch/i386/i386/machdep.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/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.666 src/sys/arch/i386/i386/machdep.c:1.667
--- src/sys/arch/i386/i386/machdep.c:1.666 Sat Mar 21 14:41:29 2009
+++ src/sys/arch/i386/i386/machdep.c Sun Mar 29 10:58:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.666 2009/03/21 14:41:29 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.667 2009/03/29 10:58:54 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.666 2009/03/21 14:41:29 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.667 2009/03/29 10:58:54 ad Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -438,7 +438,6 @@
int x, y;
vaddr_t minaddr, maxaddr;
psize_t sz;
- char pbuf[9];
/*
* For console drivers that require uvm and pmap to be initialized,
@@ -471,8 +470,6 @@
initmsgbuf((void *)msgbuf_vaddr, sz);
- printf("%s%s", copyright, version);
-
#ifdef MULTIBOOT
multiboot_print_info();
#endif
@@ -484,9 +481,6 @@
wrmsr(MSR_DEBUGCTLMSR, 0x1);
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(physmem));
- printf("total memory = %s\n", pbuf);
-
#if NCARDBUS > 0
/* Tell RBUS how much RAM we have, so it can use heuristics. */
rbus_min_start_hint(ptoa(physmem));
@@ -501,13 +495,13 @@
VM_PHYS_SIZE, 0, false, NULL);
/*
- * Finally, allocate mbuf cluster submap.
+ * Allocate mbuf cluster submap.
*/
mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
- printf("avail memory = %s\n", pbuf);
+ /* Say hello. */
+ banner();
/* Safe for i/o port / memory space allocation to use malloc now. */
#if NISA > 0 || NPCI > 0
