From 56a52c9d2d9f38878d22ef12f0e68af8ccbe23a9 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Wed, 20 May 2020 12:35:49 -0400 Subject: [PATCH 2/5] Make the kernel type "elf kernel" instead of "elf64 kernel". In head, freebsd_parse_boot_param() only handles "elf kernel" for some reason. --- sys/arm64/arm64/machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 7f1509a26d4e..9be7827be42b 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -958,7 +958,7 @@ rescue_preload_init(struct arm64_bootparams *abp) kernend = mdstart + PAGE_SIZE; md = preload_add_string(md, MODINFO_NAME, "kernel"); - md = preload_add_string(md, MODINFO_TYPE, "elf64 kernel"); + md = preload_add_string(md, MODINFO_TYPE, "elf kernel"); md = preload_add_u64(md, MODINFO_ADDR, VM_MIN_KERNEL_ADDRESS); md = preload_add_u64(md, MODINFO_SIZE, (uintptr_t)&_end - KERNBASE); md = preload_add_u64(md, MODINFO_METADATA | MODINFOMD_KERNEND, kernend); -- 2.36.1