From owner-svn-src-head@FreeBSD.ORG  Mon Apr  4 16:59:46 2011
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 C16ED1065670;
	Mon,  4 Apr 2011 16:59:46 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B28878FC12;
	Mon,  4 Apr 2011 16:59:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p34GxkT1089798;
	Mon, 4 Apr 2011 16:59:46 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p34Gxkwd089796;
	Mon, 4 Apr 2011 16:59:46 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201104041659.p34Gxkwd089796@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 4 Apr 2011 16:59:46 +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: r220332 - 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: Mon, 04 Apr 2011 16:59:46 -0000

Author: marcel
Date: Mon Apr  4 16:59:46 2011
New Revision: 220332
URL: http://svn.freebsd.org/changeset/base/220332

Log:
  Fix a long standing bug where file_load() passes down the global loadaddr
  to the l_load() method in the file_formats structure, while being passed
  an address as an argument (dest). With file_load() calling arch_loadaddr()
  now, this bug is a little bit more significant.
  
  Spotted by: nyan@ (nice catch!)

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

Modified: head/sys/boot/common/module.c
==============================================================================
--- head/sys/boot/common/module.c	Mon Apr  4 16:47:42 2011	(r220331)
+++ head/sys/boot/common/module.c	Mon Apr  4 16:59:46 2011	(r220332)
@@ -280,7 +280,7 @@ file_load(char *filename, vm_offset_t de
 
     error = EFTYPE;
     for (i = 0, fp = NULL; file_formats[i] && fp == NULL; i++) {
-	error = (file_formats[i]->l_load)(filename, loadaddr, &fp);
+	error = (file_formats[i]->l_load)(filename, dest, &fp);
 	if (error == 0) {
 	    fp->f_loader = i;		/* remember the loader */
 	    *result = fp;