The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0d1d8c8cfa57069edc7e049772a9732929177fb0
commit 0d1d8c8cfa57069edc7e049772a9732929177fb0 Author: Warner Losh <i...@freebsd.org> AuthorDate: 2025-04-11 21:45:27 +0000 Commit: Warner Losh <i...@freebsd.org> CommitDate: 2025-04-11 21:47:06 +0000 loader/efi: Fix trivial whitespace error Sponsored by: Netflix --- stand/efi/loader/arch/amd64/multiboot2.h | 4 ++-- stand/efi/loader/bootinfo.c | 2 +- stand/efi/loader/main.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/arch/amd64/multiboot2.h b/stand/efi/loader/arch/amd64/multiboot2.h index 5693923c014f..a039aa0439aa 100644 --- a/stand/efi/loader/arch/amd64/multiboot2.h +++ b/stand/efi/loader/arch/amd64/multiboot2.h @@ -244,7 +244,7 @@ struct multiboot_tag_mmap multiboot_uint32_t size; multiboot_uint32_t entry_size; multiboot_uint32_t entry_version; - struct multiboot_mmap_entry entries[0]; + struct multiboot_mmap_entry entries[0]; }; struct multiboot_vbe_info_block @@ -388,7 +388,7 @@ struct multiboot_tag_efi_mmap multiboot_uint32_t descr_size; multiboot_uint32_t descr_vers; multiboot_uint8_t efi_mmap[0]; -}; +}; struct multiboot_tag_efi32_ih { diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index ca86a319613f..75d755686658 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -414,7 +414,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) /* Handle device tree blob */ dtbp = addr; dtb_size = fdt_copy(addr); - + /* Pad to a page boundary */ if (dtb_size) addr += roundup(dtb_size, PAGE_SIZE); diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index f592f8ecf495..2384fd08b964 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -4,7 +4,7 @@ * All rights reserved. * * Copyright (c) 2016-2019 Netflix, Inc. written by M. Warner Losh - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: