From owner-svn-src-all@FreeBSD.ORG  Thu Jan 15 19:57:46 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5089D10657DD;
	Thu, 15 Jan 2009 19:57:46 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E9068FC13;
	Thu, 15 Jan 2009 19:57:46 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0FJvk6k085768;
	Thu, 15 Jan 2009 19:57:46 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0FJvk0e085767;
	Thu, 15 Jan 2009 19:57:46 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200901151957.n0FJvk0e085767@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 15 Jan 2009 19:57:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187305 - head/sys/mips/mips
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jan 2009 19:57:47 -0000

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.