summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2003-05-01 04:31:33 +0000
committerpeter <peter@FreeBSD.org>2003-05-01 04:31:33 +0000
commita6e9962a69965b679c803119c8a3d535cb2f57fa (patch)
tree4556e2069237900c3f88b08c15372f575cd78951 /sys/boot
parent01deb99c4c644d64128b361e94a1534eae19349b (diff)
downloadFreeBSD-src-a6e9962a69965b679c803119c8a3d535cb2f57fa.zip
FreeBSD-src-a6e9962a69965b679c803119c8a3d535cb2f57fa.tar.gz
Argh. This was broken by the last-minute elf32/elf64/"elf kernel" changes.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/libi386/bootinfo32.c2
-rw-r--r--sys/boot/i386/libi386/bootinfo64.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c
index a2fc2c8..4ee968f 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/sys/boot/i386/libi386/bootinfo32.c
@@ -209,7 +209,7 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t
/* pad to a page boundary */
addr = roundup(addr, PAGE_SIZE);
- kfp = file_findfile(NULL, "elf64 kernel");
+ kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
kfp = file_findfile(NULL, "elf32 kernel");
if (kfp == NULL)
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index 5398a0c..77e05e8 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -179,9 +179,9 @@ bi_load64(char *args, vm_offset_t *modulep, vm_offset_t *kernendp)
/* pad to a page boundary */
addr = roundup(addr, PAGE_SIZE);
- kfp = file_findfile(NULL, "elf64 kernel");
+ kfp = file_findfile(NULL, "elf kernel");
if (kfp == NULL)
- kfp = file_findfile(NULL, "elf32 kernel");
+ kfp = file_findfile(NULL, "elf64 kernel");
if (kfp == NULL)
panic("can't find kernel file");
kernend = 0; /* fill it in later */
OpenPOWER on IntegriCloud