From owner-p4-projects@FreeBSD.ORG  Sat Apr  5 13:48:21 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A5C137B416; Sat,  5 Apr 2003 13:48:20 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4033337B401
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 13:48:18 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DE19143FBD
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 13:48:17 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h35LmH0U022649
	for <perforce@freebsd.org>; Sat, 5 Apr 2003 13:48:17 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35LmHkr022646
	for perforce@freebsd.org; Sat, 5 Apr 2003 13:48:17 -0800 (PST)
Date: Sat, 5 Apr 2003 13:48:17 -0800 (PST)
Message-Id: <200304052148.h35LmHkr022646@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28255 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2003 21:48:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=28255

Change 28255 by peter@peter_overcee on 2003/04/05 13:47:29

	tidy up some stray bits

Affected files ...

.. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#3 edit

Differences ...

==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#3 (text+ko) ====

@@ -256,8 +256,9 @@
 int
 bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t *modulep)
 {
-    struct preloaded_file	*xp;
+    struct preloaded_file	*xp, *kfp;
     struct i386_devdesc		*rootdev;
+    struct file_metadata	*md;
     vm_offset_t			addr;
     vm_offset_t			kernend;
     vm_offset_t			envp;
@@ -267,7 +268,7 @@
     char			*kernelname;
     const char			*kernelpath;
 
-    howtop = bi_getboothowto(args);
+    *howtop = bi_getboothowto(args);
 
     /* 
      * Allow the environment variable 'rootdev' to override the supplied device 
@@ -330,7 +331,9 @@
     /* pad to a page boundary */
     addr = roundup(addr, PAGE_SIZE);
 
-    kfp = file_findfile(NULL, "elf kernel");
+    kfp = file_findfile(NULL, "elf64 kernel");
+    if (kfp == NULL)
+      kfp = file_findfile(NULL, "elf32 kernel");
     if (kfp == NULL)
 	panic("can't find kernel file");
     kernend = 0;	/* fill it in later */