From owner-svn-src-stable@FreeBSD.ORG  Mon Apr 29 10:20:46 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 97039CF3;
 Mon, 29 Apr 2013 10:20:46 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 89F15167C;
 Mon, 29 Apr 2013 10:20:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3TAKkuv053904;
 Mon, 29 Apr 2013 10:20:46 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3TAKkLA053903;
 Mon, 29 Apr 2013 10:20:46 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201304291020.r3TAKkLA053903@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 29 Apr 2013 10:20:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r250043 - stable/9/sys/boot/common
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Apr 2013 10:20:46 -0000

Author: ae
Date: Mon Apr 29 10:20:46 2013
New Revision: 250043
URL: http://svnweb.freebsd.org/changeset/base/250043

Log:
  MFC r249719:
    Since we didn't break the loop, we should set i to -1 to start from the
    beginning.
  
    Submitted by:	Steven Hartland

Modified:
  stable/9/sys/boot/common/module.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/boot/   (props changed)

Modified: stable/9/sys/boot/common/module.c
==============================================================================
--- stable/9/sys/boot/common/module.c	Mon Apr 29 08:21:32 2013	(r250042)
+++ stable/9/sys/boot/common/module.c	Mon Apr 29 10:20:46 2013	(r250043)
@@ -289,7 +289,8 @@ file_load(char *filename, vm_offset_t de
 	    break;
 	} else if (last_file_format == i && i != 0) {
 	    /* Restart from the beginning */
-	    last_file_format = i = 0;
+	    i = -1;
+	    last_file_format = 0;
 	    fp = NULL;
 	    continue;
 	}