From owner-svn-src-projects@FreeBSD.ORG  Thu Nov 21 23:00:00 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AE7BD8FC;
 Thu, 21 Nov 2013 23:00:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9ECE92E05;
 Thu, 21 Nov 2013 23:00:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rALN00CJ096682;
 Thu, 21 Nov 2013 23:00:00 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rALN003X096680;
 Thu, 21 Nov 2013 23:00:00 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201311212300.rALN003X096680@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 21 Nov 2013 23:00:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r258453 - projects/uefi/sys/amd64/amd64
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Nov 2013 23:00:00 -0000

Author: emaste
Date: Thu Nov 21 23:00:00 2013
New Revision: 258453
URL: http://svnweb.freebsd.org/changeset/base/258453

Log:
  Merge r258436 from HEAD
  
  (Merged individually due to conflict)
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/uefi/sys/amd64/amd64/machdep.c
Directory Properties:
  projects/uefi/   (props changed)
  projects/uefi/sys/   (props changed)

Modified: projects/uefi/sys/amd64/amd64/machdep.c
==============================================================================
--- projects/uefi/sys/amd64/amd64/machdep.c	Thu Nov 21 22:51:25 2013	(r258452)
+++ projects/uefi/sys/amd64/amd64/machdep.c	Thu Nov 21 23:00:00 2013	(r258453)
@@ -1444,15 +1444,14 @@ add_smap_entries(struct bios_smap *smapb
 
 	for (smap = smapbase; smap < smapend; smap++) {
 		if (boothowto & RB_VERBOSE)
-			printf("SMAP type=%02x base=%016lx "
-			    "len=%016lx\n",
+			printf("SMAP type=%02x base=%016lx len=%016lx\n",
 			    smap->type, smap->base, smap->length);
 
 		if (smap->type != SMAP_TYPE_MEMORY)
 			continue;
 
-		if (!add_physmap_entry(smap->base, smap->length,
-		    physmap, physmap_idx))
+		if (!add_physmap_entry(smap->base, smap->length, physmap,
+		    physmap_idx))
 			break;
 	}
 }