From owner-svn-src-all@FreeBSD.ORG  Wed Feb 27 19:59:42 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2F0C3ADE;
 Wed, 27 Feb 2013 19:59:42 +0000 (UTC) (envelope-from ian@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 21143AF4;
 Wed, 27 Feb 2013 19:59:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RJxgdS082986;
 Wed, 27 Feb 2013 19:59:42 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RJxg7i082985;
 Wed, 27 Feb 2013 19:59:42 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201302271959.r1RJxg7i082985@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Wed, 27 Feb 2013 19:59:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247413 - head/sys/boot/common
X-SVN-Group: head
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.14
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: Wed, 27 Feb 2013 19:59:42 -0000

Author: ian
Date: Wed Feb 27 19:59:41 2013
New Revision: 247413
URL: http://svnweb.freebsd.org/changeset/base/247413

Log:
  Fix a typo that prevented booting a kernel that had virtual addresses in
  the elf headers.

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

Modified: head/sys/boot/common/load_elf.c
==============================================================================
--- head/sys/boot/common/load_elf.c	Wed Feb 27 19:51:47 2013	(r247412)
+++ head/sys/boot/common/load_elf.c	Wed Feb 27 19:59:41 2013	(r247413)
@@ -304,7 +304,7 @@ __elfN(loadimage)(struct preloaded_file 
 	 * only adjust the entry point if it's a virtual address to begin with.
 	 */
 	off = -0xc0000000u;
-	if ((ehdr->e_entry & 0xc0000000u) == 0xc000000u)
+	if ((ehdr->e_entry & 0xc0000000u) == 0xc0000000u)
 		ehdr->e_entry += off;
 #ifdef ELF_VERBOSE
 	printf("ehdr->e_entry 0x%08x, va<->pa off %llx\n", ehdr->e_entry, off);