From owner-svn-src-head@FreeBSD.ORG  Sun Sep 30 13:14:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A87A106564A;
	Sun, 30 Sep 2012 13:14:38 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 666788FC0A;
	Sun, 30 Sep 2012 13:14:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8UDEcUY036010;
	Sun, 30 Sep 2012 13:14:38 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8UDEbQd036007;
	Sun, 30 Sep 2012 13:14:37 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201209301314.q8UDEbQd036007@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Sun, 30 Sep 2012 13:14:37 +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: r241069 - head/sys/boot/common
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2012 13:14:38 -0000

Author: ae
Date: Sun Sep 30 13:14:37 2012
New Revision: 241069
URL: http://svn.freebsd.org/changeset/base/241069

Log:
  Remember the file format of the last loaded module and try to use it for
  next files.

Modified:
  head/sys/boot/common/module.c

Modified: head/sys/boot/common/module.c
==============================================================================
--- head/sys/boot/common/module.c	Sun Sep 30 12:24:15 2012	(r241068)
+++ head/sys/boot/common/module.c	Sun Sep 30 13:14:37 2012	(r241069)
@@ -271,6 +271,7 @@ command_lsmod(int argc, char *argv[])
 int
 file_load(char *filename, vm_offset_t dest, struct preloaded_file **result)
 {
+    static int last_file_format = 0;
     struct preloaded_file *fp;
     int error;
     int i;
@@ -279,12 +280,18 @@ file_load(char *filename, vm_offset_t de
 	dest = archsw.arch_loadaddr(LOAD_RAW, filename, dest);
 
     error = EFTYPE;
-    for (i = 0, fp = NULL; file_formats[i] && fp == NULL; i++) {
+    for (i = last_file_format, fp = NULL;
+	file_formats[i] && fp == NULL; i++) {
 	error = (file_formats[i]->l_load)(filename, dest, &fp);
 	if (error == 0) {
-	    fp->f_loader = i;		/* remember the loader */
+	    fp->f_loader = last_file_format = i; /* remember the loader */
 	    *result = fp;
 	    break;
+	} else if (last_file_format == i && i != 0) {
+		/* Restart from the beginning */
+		last_file_format = i = 0;
+		fp = NULL;
+		continue;
 	}
 	if (error == EFTYPE)
 	    continue;		/* Unknown to this handler? */