svn commit: r187305 - head/sys/mips/mips

Warner Losh imp at FreeBSD.org
Thu Jan 15 11:57:47 PST 2009


Author: imp
Date: Thu Jan 15 19:57:45 2009
New Revision: 187305
URL: http://svn.freebsd.org/changeset/base/187305

Log:
  Reduce diffs to p4 that were the result of a mismerge on my part.

Modified:
  head/sys/mips/mips/machdep.c

Modified: head/sys/mips/mips/machdep.c
==============================================================================
--- head/sys/mips/mips/machdep.c	Thu Jan 15 19:35:23 2009	(r187304)
+++ head/sys/mips/mips/machdep.c	Thu Jan 15 19:57:45 2009	(r187305)
@@ -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.


More information about the svn-src-all mailing list