summaryrefslogtreecommitdiffstats
path: root/sys/mips
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2009-01-15 19:57:45 +0000
committerimp <imp@FreeBSD.org>2009-01-15 19:57:45 +0000
commit30335a2835b1cf67e8ae777064ff1c0f98b0c5f0 (patch)
treec914b2073aa2961f3d170dc22ddf85f23d245435 /sys/mips
parenta5f2b191e0a5f7902779ef59592031e1fd9e2663 (diff)
downloadFreeBSD-src-30335a2835b1cf67e8ae777064ff1c0f98b0c5f0.zip
FreeBSD-src-30335a2835b1cf67e8ae777064ff1c0f98b0c5f0.tar.gz
Reduce diffs to p4 that were the result of a mismerge on my part.
Diffstat (limited to 'sys/mips')
-rw-r--r--sys/mips/mips/machdep.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/mips/mips/machdep.c b/sys/mips/mips/machdep.c
index 86a9d87..a8fcb76 100644
--- a/sys/mips/mips/machdep.c
+++ b/sys/mips/mips/machdep.c
@@ -36,7 +36,7 @@
*
* from: @(#)machdep.c 8.3 (Berkeley) 1/12/94
* Id: machdep.c,v 1.33 1998/09/15 10:58:54 pefo Exp
- * JNPR: machdep.c,v 1.11.2.3 2007/08/29 12:24:49 girish
+ * JNPR: machdep.c,v 1.11.2.3 2007/08/29 12:24:49
*/
#include <sys/cdefs.h>
@@ -157,7 +157,10 @@ cpu_startup(void *dummy)
if (boothowto & RB_VERBOSE)
bootverbose++;
- printf("real memory = %lu (%luK bytes)\n", ptoa(realmem), ptoa(realmem) / 1024);
+
+ bootverbose++;
+ printf("real memory = %lu (%luK bytes)\n", ptoa(realmem),
+ ptoa(realmem) / 1024);
/*
* Display any holes after the first chunk of extended memory.
OpenPOWER on IntegriCloud