PERFORCE change 28255 for review

[Peter Wemm]

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

Change 28255 by peter at 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 */