diff options
| -rw-r--r-- | sys/boot/efi/libefi/bootinfo.c | 6 | ||||
| -rw-r--r-- | sys/boot/ia64/common/bootinfo.c | 6 | ||||
| -rw-r--r-- | sys/boot/ia64/libski/bootinfo.c | 5 | ||||
| -rw-r--r-- | sys/boot/ia64/ski/bootinfo.c | 5 | ||||
| -rw-r--r-- | sys/ia64/include/bootinfo.h | 2 |
5 files changed, 1 insertions, 23 deletions
diff --git a/sys/boot/efi/libefi/bootinfo.c b/sys/boot/efi/libefi/bootinfo.c index 18e5405..5fdbebf 100644 --- a/sys/boot/efi/libefi/bootinfo.c +++ b/sys/boot/efi/libefi/bootinfo.c @@ -249,7 +249,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey) struct preloaded_file *xp; vm_offset_t addr, bootinfo_addr; u_int pad; - char *kernelname; vm_offset_t ssym, esym; struct file_metadata *md; EFI_STATUS status; @@ -328,11 +327,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey) /* all done copying stuff in, save end of loaded object space */ bi->bi_kernend = addr; - kernelname = getenv("kernelname"); - if (kernelname) { - strncpy(bi->bi_kernel, kernelname, sizeof(bi->bi_kernel) - 1); - } - /* read memory map and stash it after bootinfo */ bi->bi_memmap = (u_int64_t)(bi + 1); bi->bi_memmap_size = 8192 - sizeof(struct bootinfo); diff --git a/sys/boot/ia64/common/bootinfo.c b/sys/boot/ia64/common/bootinfo.c index 18e5405..5fdbebf 100644 --- a/sys/boot/ia64/common/bootinfo.c +++ b/sys/boot/ia64/common/bootinfo.c @@ -249,7 +249,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey) struct preloaded_file *xp; vm_offset_t addr, bootinfo_addr; u_int pad; - char *kernelname; vm_offset_t ssym, esym; struct file_metadata *md; EFI_STATUS status; @@ -328,11 +327,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey) /* all done copying stuff in, save end of loaded object space */ bi->bi_kernend = addr; - kernelname = getenv("kernelname"); - if (kernelname) { - strncpy(bi->bi_kernel, kernelname, sizeof(bi->bi_kernel) - 1); - } - /* read memory map and stash it after bootinfo */ bi->bi_memmap = (u_int64_t)(bi + 1); bi->bi_memmap_size = 8192 - sizeof(struct bootinfo); diff --git a/sys/boot/ia64/libski/bootinfo.c b/sys/boot/ia64/libski/bootinfo.c index 7edba21..f7b8ae3 100644 --- a/sys/boot/ia64/libski/bootinfo.c +++ b/sys/boot/ia64/libski/bootinfo.c @@ -318,11 +318,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, char *args) /* all done copying stuff in, save end of loaded object space */ bi->bi_kernend = addr; - kernelname = getenv("kernelname"); - if (kernelname) { - strncpy(bi->bi_kernel, kernelname, sizeof(bi->bi_kernel) - 1); - } - /* Describe the SKI memory map. */ bi->bi_memmap = (u_int64_t)(bi + 1); bi->bi_memmap_size = 2 * sizeof(EFI_MEMORY_DESCRIPTOR); diff --git a/sys/boot/ia64/ski/bootinfo.c b/sys/boot/ia64/ski/bootinfo.c index 7edba21..f7b8ae3 100644 --- a/sys/boot/ia64/ski/bootinfo.c +++ b/sys/boot/ia64/ski/bootinfo.c @@ -318,11 +318,6 @@ bi_load(struct bootinfo *bi, struct preloaded_file *fp, char *args) /* all done copying stuff in, save end of loaded object space */ bi->bi_kernend = addr; - kernelname = getenv("kernelname"); - if (kernelname) { - strncpy(bi->bi_kernel, kernelname, sizeof(bi->bi_kernel) - 1); - } - /* Describe the SKI memory map. */ bi->bi_memmap = (u_int64_t)(bi + 1); bi->bi_memmap_size = 2 * sizeof(EFI_MEMORY_DESCRIPTOR); diff --git a/sys/ia64/include/bootinfo.h b/sys/ia64/include/bootinfo.h index d5914f8..d31f48b 100644 --- a/sys/ia64/include/bootinfo.h +++ b/sys/ia64/include/bootinfo.h @@ -46,7 +46,7 @@ struct bootinfo { u_int64_t bi_magic; /* BOOTINFO_MAGIC */ u_int64_t bi_version; /* version 1 */ - char bi_kernel[64]; /* name of booted kernel */ + u_int64_t bi_spare[8]; /* was: name of booted kernel */ u_int64_t bi_boothowto; /* value for boothowto */ u_int64_t bi_systab; /* pa of EFI system table */ u_int64_t bi_memmap; /* pa of EFI memory map */ |
