Date: Thu, 21 Nov 2013 23:00:00 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258453 - projects/uefi/sys/amd64/amd64 Message-ID: <201311212300.rALN003X096680@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311212300.rALN003X096680>