Module Name: src
Committed By: matt
Date: Fri Jun 26 22:11:10 UTC 2015
Modified Files:
src/sys/arch/evbmips/alchemy: machdep.c
src/sys/arch/evbmips/atheros: machdep.c
Log Message:
Just cpu_startup_common()
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbmips/alchemy/machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbmips/atheros/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/evbmips/alchemy/machdep.c
diff -u src/sys/arch/evbmips/alchemy/machdep.c:1.54 src/sys/arch/evbmips/alchemy/machdep.c:1.55
--- src/sys/arch/evbmips/alchemy/machdep.c:1.54 Tue Mar 25 10:44:12 2014
+++ src/sys/arch/evbmips/alchemy/machdep.c Fri Jun 26 22:11:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.54 2014/03/25 10:44:12 martin Exp $ */
+/* $NetBSD: machdep.c,v 1.55 2015/06/26 22:11:10 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2014/03/25 10:44:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2015/06/26 22:11:10 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -343,42 +343,7 @@ consinit(void)
void
cpu_startup(void)
{
- char pbuf[9];
- vaddr_t minaddr, maxaddr;
-#ifdef DEBUG
- extern int pmapdebug; /* XXX */
- int opmapdebug = pmapdebug;
-
- pmapdebug = 0; /* Shut up pmap debug during bootstrap */
-#endif
-
- /*
- * Good {morning,afternoon,evening,night}.
- */
- printf("%s%s", copyright, version);
- printf("%s\n", cpu_getmodel());
- format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
- printf("total memory = %s\n", pbuf);
-
- minaddr = 0;
-
- /*
- * Allocate a submap for physio
- */
- phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
- VM_PHYS_SIZE, 0, false, NULL);
-
- /*
- * No need to allocate an mbuf cluster submap. Mbuf clusters
- * are allocated via the pool allocator, and we use KSEG to
- * map those pages.
- */
-
-#ifdef DEBUG
- pmapdebug = opmapdebug;
-#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
- printf("avail memory = %s\n", pbuf);
+ cpu_startup_common();
}
void
Index: src/sys/arch/evbmips/atheros/machdep.c
diff -u src/sys/arch/evbmips/atheros/machdep.c:1.29 src/sys/arch/evbmips/atheros/machdep.c:1.30
--- src/sys/arch/evbmips/atheros/machdep.c:1.29 Mon Mar 24 20:06:31 2014
+++ src/sys/arch/evbmips/atheros/machdep.c Fri Jun 26 22:11:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.29 2014/03/24 20:06:31 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.30 2015/06/26 22:11:10 matt Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2014/03/24 20:06:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2015/06/26 22:11:10 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -306,41 +306,7 @@ consinit(void)
void
cpu_startup(void)
{
- char pbuf[9];
- vaddr_t minaddr, maxaddr;
-#ifdef DEBUG
- extern int pmapdebug; /* XXX */
- int opmapdebug = pmapdebug;
-
- pmapdebug = 0; /* Shut up pmap debug during bootstrap */
-#endif
-
- /*
- * Good {morning,afternoon,evening,night}.
- */
- printf("%s%s", copyright, version);
- printf("%s\n", cpu_getmodel());
- format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
- printf("total memory = %s\n", pbuf);
-
- minaddr = 0;
- /*
- * Allocate a submap for physio
- */
- phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
- VM_PHYS_SIZE, 0, FALSE, NULL);
-
- /*
- * No need to allocate an mbuf cluster submap. Mbuf clusters
- * are allocated via the pool allocator, and we use KSEG to
- * map those pages.
- */
-
-#ifdef DEBUG
- pmapdebug = opmapdebug;
-#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
- printf("avail memory = %s\n", pbuf);
+ cpu_startup_common();
}
void
