From owner-svn-src-all@FreeBSD.ORG  Thu Jul 24 14:24:28 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0BEE168B;
 Thu, 24 Jul 2014 14:24:28 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ECB78255D;
 Thu, 24 Jul 2014 14:24:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6OEORKj068287;
 Thu, 24 Jul 2014 14:24:27 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6OEOR3l068286;
 Thu, 24 Jul 2014 14:24:27 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201407241424.s6OEOR3l068286@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 24 Jul 2014 14:24:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r269060 - stable/10/sys/amd64/amd64
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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, 24 Jul 2014 14:24:28 -0000

Author: emaste
Date: Thu Jul 24 14:24:27 2014
New Revision: 269060
URL: http://svnweb.freebsd.org/changeset/base/269060

Log:
  MFC r258471: Don't abort SMAP processing after an entry of length 0
  
    Length 0 is not special and should just be skipped.  This is the same
    behaviour as i386.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/amd64/amd64/machdep.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/10/sys/amd64/amd64/machdep.c	Thu Jul 24 14:11:33 2014	(r269059)
+++ stable/10/sys/amd64/amd64/machdep.c	Thu Jul 24 14:24:27 2014	(r269060)
@@ -1344,7 +1344,7 @@ add_smap_entry(struct bios_smap *smap, v
 		return (1);
 
 	if (smap->length == 0)
-		return (0);
+		return (1);
 
 	/*
 	 * Find insertion point while checking for overlap.  Start off by