From nobody Fri Apr 11 22:04:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZZ9hp0ZcCz5sl99; Fri, 11 Apr 2025 22:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZZ9hn5rkKz44XY; Fri, 11 Apr 2025 22:04:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744409097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7RvvGvGZ7RW8/L3yOSNqV6mUMxAOWrmhIqEjL7UCscY=; b=lolIAxTb86UlYxpqEMjsOW69SeSRKdx3Bau/Kx38T5I2B04LIOl8ffzWbDgH3dhi0z/Q0m RG9DApOkmHPJIBUZ8HDwdwZKbdCR95QAXxsMqZgQUupdaUIGtV0PctfUawmb9zBlXYntH7 5xY/et1wOvw7yYULKfP51BzBRAzRvUNQ2U1+C2LEn9pbA7VkVykw2Ti4bnPxmSuvvlvBAE ridUm1tlYCTWn7OdideGMM6h+OccjYDCiMkZ4uvjE4rfP8HGv3j7jopPiUpAB+ObPXH0JF i7aty1wRH29vquRTNFGlTem0YApsFk/Ayuf9Nv6dO5BCl1QXl+3LENugirRVDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744409097; a=rsa-sha256; cv=none; b=gnqfeFlkAV15XmLFFewrr1uj0BvSpRda3uEIpbP6bi184feGuiYUZUY1XANWGVG0amW5gp IVKwaWun1vrCtfXbhXjT/0ETN8oTef+6y3wpb/qL3bXjH8CATZWoATF6UiRBTDF1S5oli8 I56aBQiAY58sOi4JaPD4xovjumC75t9tTS384NGeKXRHFBHdClfYa2IkHr6kJO4gxLZK8t twc7vTlnrM9/Eh5KPUT5zZlQvSOkD6irshnouLgXZHKDWeaNl95dW/db/4yicSJG9Fr4j9 8hPk3SjOfmUaxp0Ao7askY0GUqn50ONkiKk0ZHvv+3Fy0w3ddxoL9np/4SE4xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744409097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7RvvGvGZ7RW8/L3yOSNqV6mUMxAOWrmhIqEjL7UCscY=; b=BhF2o6wxIvoM2sJoSY15BD91edI1vC6mfRhyhwAOM1ImOo2zwUn6T2YN7ZMOsqWboVUll0 Df19hQmVb0kFN+ySvqOhzwnFv4AgcgvI+eLqE5uRlsVIientRmqLJaikvrHAvJN5dzsn5e mahrrj8Nha2hXtJo5QEYIWPBTf+9iFqOiKZzQq3GerRC0gJnke5lfrWp05FOb4rUcSWsQf W+myCDvE2JfQKHlH4ehxT+mLfO7Eb82CtxdjawhNk4sbsHhQqodaQ29bMUyON2yp9zxgmS yn4WrbgTfjQqVGM4+jXUbfrqKPJZdtbGkWgIQsMY/Gn82PhZquh70C2eDy3pJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZZ9hn56fVzqWH; Fri, 11 Apr 2025 22:04:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53BM4vpS053822; Fri, 11 Apr 2025 22:04:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BM4vE1053819; Fri, 11 Apr 2025 22:04:57 GMT (envelope-from git) Date: Fri, 11 Apr 2025 22:04:57 GMT Message-Id: <202504112204.53BM4vE1053819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0d1d8c8cfa57 - main - loader/efi: Fix trivial whitespace error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d1d8c8cfa57069edc7e049772a9732929177fb0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0d1d8c8cfa57069edc7e049772a9732929177fb0 commit 0d1d8c8cfa57069edc7e049772a9732929177fb0 Author: Warner Losh AuthorDate: 2025-04-11 21:45:27 +0000 Commit: Warner Losh 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: