From nobody Tue Jun 27 17:19:48 2023 X-Original-To: dev-commits-src-main@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 4QrBKd3211z4f4VW; Tue, 27 Jun 2023 17:19:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QrBKd24vxz3Nnc; Tue, 27 Jun 2023 17:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687886389; 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=hCSGudppe/ZsVZsfOusczL1i3Xj76PODWWTnVNPcABM=; b=W+ALAZxqOZzTFvjNSdCRXf6VDkaTLbRNizugVPt4mRUO9kNi6l1afSj/BAf1ky+Re1HjBr dAboCRxNgqvtHx551hRPuTlhEJQ9jjyyW4rwRpI+YsGGMHdjHKnu6ZDarN56QZ2p3PLJxb bXexnaItGbcQ38epcYnSs9PSrPlhIrdJZjQuiIdEk934G/BX10g+3XhZ+D+KJVkyZgwb/K p2cqULrYB89U5/+tTMcCe1EbzXIOS4FpA9KvVUk6u4wOC7A3y3fdCy6ZTOUwIcLswoWBZF in4aNPBVeb4xi9pJQ+fBtZDs8mH2RHBgbsg20+yUacnYSwDx6jfB/DXAkUDExg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687886389; 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=hCSGudppe/ZsVZsfOusczL1i3Xj76PODWWTnVNPcABM=; b=bXSMNlI0Mw+AoX6kZmgblwWHLjOaFwGrQfTNry6sXF1OmNpBhKVzHAAZFS89ZHKqQ+PxIc mcDiGKwzofwryA1OxgcvyZPXRMO76oIFYul7j9n2BpsR7kPC0I6+AvKrBzT1YtgxQoiRBu geH8J3q6owvjLSzGjQZHQ1LnCC0GjzRv4Pi5xZ9bsjTqlVfnbB3e0nQqdwrX4EzKxNmKCC HSwwp9MDN7eQllbOAqhmbK6C56YUMZ0gQQYm5ziuC94zNhn9XO/R/6Cn7zm+fgLRKwFINB 3mCXAuah1mLh1HMKVgwuY/l9fIkAR9se2YFqN/Rs3JO7xrOGv7f6ecr3vRz6XQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687886389; a=rsa-sha256; cv=none; b=HGU3p1KL1uB9hlm65dsU27OQfL0i6aMilOMXXAuoo1UM8IhCdJSCkywwwfR4f21wX05KFm sFMtiI++Sx5ApJ3pZNeFtxwma3PtydYjTqnIsIivTlFSDXWghpiW+ihdDfYH6HQC+tM7RT YXNvjIzBXaHVUqLMHQa+8U7G5Nmbn/bjC9BwdWuZIJxb2dvs8kBloG31tLVMdT64aCK/M8 6xV4wQrdnRu41bGBjGkGdfLngdc8djtiklYWxk9ygCJTDTfleN2YvF+9TZsM8qwcl1EiR3 OktGIGrEF1+7xeiEeXxQJ3MpqlmGRNKC3clHU3MCJYNuJi9Mt0pp05gK5k0vkw== 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 4QrBKd0kP2z11JK; Tue, 27 Jun 2023 17:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35RHJnLa006988; Tue, 27 Jun 2023 17:19:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35RHJmbJ006987; Tue, 27 Jun 2023 17:19:48 GMT (envelope-from git) Date: Tue, 27 Jun 2023 17:19:48 GMT Message-Id: <202306271719.35RHJmbJ006987@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b9f56cabeda4 - main - efi loader: Move 'module' variable under #ifdef MODINFOMD_MODULEP. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9f56cabeda4c05c8dec1dd0315ccea45f5739da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f56cabeda4c05c8dec1dd0315ccea45f5739da commit b9f56cabeda4c05c8dec1dd0315ccea45f5739da Author: John Baldwin AuthorDate: 2023-06-27 17:19:32 +0000 Commit: John Baldwin CommitDate: 2023-06-27 17:19:32 +0000 efi loader: Move 'module' variable under #ifdef MODINFOMD_MODULEP. This quiets a set but unused warning on platforms without this module info such as aarch64. Differential Revision: https://reviews.freebsd.org/D40672 --- stand/efi/loader/bootinfo.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index d79f59343af1..6dad3868b840 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -334,7 +334,10 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) struct devdesc *rootdev; struct file_metadata *md; vm_offset_t addr; - uint64_t kernend, module; + uint64_t kernend; +#ifdef MODINFOMD_MODULEP + uint64_t module; +#endif uint64_t envp; vm_offset_t size; char *rootdevname; @@ -415,7 +418,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) kernend = 0; /* fill it in later */ /* Figure out the size and location of the metadata. */ - module = *modulep = addr; + *modulep = addr; file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof(howto), &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof(envp), &envp); @@ -428,6 +431,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) #endif file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof(kernend), &kernend); #ifdef MODINFOMD_MODULEP + module = *modulep; file_addmetadata(kfp, MODINFOMD_MODULEP, sizeof(module), &module); #endif #ifdef EFI