From nobody Wed Sep 10 08:00:03 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 4cMClm0j7Sz67GJp; Wed, 10 Sep 2025 08:00:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cMCll6rJvz3KVN; Wed, 10 Sep 2025 08:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757491204; 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=qX2ErUCK8M+psOe9bPdSk9HegAHGN63OtNftrXMdpMc=; b=rn8/soDN7zsg2Ta49gPGqH7aYQ2b9eQfsb5APj0aPZtV7krtJub15AoK1ZirVCiQtsdP+3 omrFl3LuMhWq9ripb/VHpWf/7hezw5XMFIrobmajIPh4rHYNnFj6pHz/Wy9pktXtam2mMf r9PKkPlJ2K2aKvSfcwlsb9BWepue5s2K9mSVUnbF9dnHs0Dv1aLao/01AEvTfUbGv2bFO6 w+OBYmuXBkl2NtstR+x6AwG4yX184f8dIwzUujpPjaR6fI/Z6FjFri20+5HNEwIMYBtDup 8chS5c8DuNvBLieyATJB2Yn4O580cVP38rlDZi56tg5es/oJe44irtPNsFmHVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757491204; 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=qX2ErUCK8M+psOe9bPdSk9HegAHGN63OtNftrXMdpMc=; b=MjvQz/APO3VKF2FSZe6wksJF423SPh6OG0GH1L5SdU8IOWIEjFsVsHYNZTMKq2A3ltg4Kj sWL/7sL1EPzdOglhg0lH2Ag/RT1U/tVoOr74mTFH5Gtwwmv8yK39ilvUcU6I0CbkctMzeP i7gD8GGGJmXjK1lzITyuM6vAFX3V4rGnwtnuppJO7ZcIJbLfl1+0kaPTIQcwfRjQxbJCgW 3S1pIfpW9gxQwP0iU7/PY1/YJTK4IFAtjAO1qqtmybBgzPLQFAeSUi1wAFJ1tIM8af2Drk WMH+y/l5lfkF9nISVI72C/4ibO8fZjfPlo1Ep4hyf+Fz16QbcXmzR8EjzcJTkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757491204; a=rsa-sha256; cv=none; b=N0kJNtvhrfi7xt7MTD14cMpuVhtvSHTV74k6dr+PWZE1EfBHZUV/Towbad7Z7zKyYXm6Uv xQcjibuktJOcV/IJ9b8h5XYGPVtWkUG4TmintB4/9DrCcdgRt/Bov4eHGwJ6Mri3tzVbp9 xTN7KASfnhX3LivVS4AYeWGeNtHpPAARTAEmVJRyfyaMn39k3h8SV+80EPUBPJ8zjrBl+/ 0c40cfsrzs6Sj3/OOc/pP55o/S/q8oOEV3KtQs//kESEwHz+tR0Sp1+tMtuI97uDWFLZ7K m+4M4Uz3hwlQvhmKsCt8nP9+oKHBoNe34d0adM58rtMu4bQ/fn3xpS5aNfHtbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cMCll6Mpmz1CFP; Wed, 10 Sep 2025 08:00:03 +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 58A803HT049352; Wed, 10 Sep 2025 08:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58A803LT049349; Wed, 10 Sep 2025 08:00:03 GMT (envelope-from git) Date: Wed, 10 Sep 2025 08:00:03 GMT Message-Id: <202509100800.58A803LT049349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 80661e2153d2 - main - loader/efi: fix non-x86 build 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80661e2153d2bc916444cb3be8aa50d0d110ad57 Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=80661e2153d2bc916444cb3be8aa50d0d110ad57 commit 80661e2153d2bc916444cb3be8aa50d0d110ad57 Author: Ahmad Khalifa AuthorDate: 2025-09-10 07:43:27 +0000 Commit: Ahmad Khalifa CommitDate: 2025-09-10 07:48:20 +0000 loader/efi: fix non-x86 build Pointy hat to: vexeduxr Reported by: Bakul Shah --- stand/efi/loader/bootinfo.c | 2 +- stand/efi/loader/copy.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 3230200e9be5..7931622c2df6 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -67,7 +67,7 @@ static int bi_getboothowto(char *kargs) { -#ifdef EFI +#if defined(EFI) && (defined(__i386__) || defined(__amd64__)) const char *tmp; int speed, port; char buf[50]; diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index bf1a7a075400..7452726565ad 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -405,7 +405,9 @@ efi_check_space(vm_offset_t end) return (true); } +#if defined(__amd64__) || defined(__i386__) before_staging: +#endif /* Try allocating space before the previous allocation */ if (staging < nr_pages * EFI_PAGE_SIZE) goto expand;