From nobody Thu Dec 05 00:18:57 2024 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 4Y3ZkT5SkPz5gRN7; Thu, 05 Dec 2024 00:18:57 +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 4Y3ZkT4Bwpz4bB8; Thu, 5 Dec 2024 00:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733357937; 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=arNYsFGf/73Orb40cyfAWUMHOXmiot6ZJtlHKAZO0LA=; b=D+5jyl598cZXF9UTtdwlTXr+Eflr0Nn7a9xcdjMfrh5C3yBS7grLl9hmGCOak9fAH6vjWQ ovigvFWS9LAMN1Jc3C99T2DBFxRXawTXiOSNYcDPEMHcFZvP5uiU7/iZE4simjs6GbjWAO SnbtYqJjAMsBdj9NT7KS02pEA7oSJmPwnI7iffFnM8nX6smJVXbcqaV9rsmiXi/TffUOQg j8bsnj4P5NUzQ8L1flwSpH4Kcf2e8OhsmbgyLNLvakalzIzGlYQKPCUhJRrrf3pBlH9tu0 WJM1gleuG1BrmPD8+ZU7SC9nvKh7NySO7cD1GJgT2pHe7A3POetj5lUBQXFxHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733357937; 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=arNYsFGf/73Orb40cyfAWUMHOXmiot6ZJtlHKAZO0LA=; b=OHXU4q3ZocEaPbLW/S5qG4Ino7soEKglkKN6PtspRB1sXTJ5fa2fTXWlFpzY51GthrdhfQ JY550mY7e1trDvVFKGmtxh/oOCp6pYaPIUUiJwUPcUnUIEAGuqTPMI0Bf9JCL/hfNkJTq+ /riozBilyLmWga7ame+BHIy2JarrOufnMgAE7vmsPsRRw3+cl4UWSeKXCXC/Q8bItGwlmA /9OT5yMrw2/VCA89ad3ekd3nYne63qqN+nKVNTVl34FiPgkFh4C7gqqq5BBOpkrhftMB0/ 4oeQ3N4skc6Kn9lP8ZWTkNVG9hu0bZeWCzTnyPpjFcZY+ZLQ5wvAkGr6BCrPBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733357937; a=rsa-sha256; cv=none; b=jBvowjpbUUuBjuw8VXceIwupI/AYiS/uBvbzzS4/LySjKM/WCGioTK3V3Opal6pC05+EvF o+GPZ3akosSGv1leAghk1c6MCjKosJf7rFFnDMN+7Donl9hTErImolglzQrT1wsJ9gnPTa NBI6UfRlu+8VPyOHeG4KWDCP52Q/HDLGGyqmKgDkp6HWQ7nrC0vMsK0tLbtMHoih6JcLx7 cQ7toNvchB+IY4yUKyVtppQnutchx03BB/auljeDL/nZ98emeR9LF9IjWZ8atcQPc0nRju 4XJaKkdJDtOnjiiT7sC1ltVDAxFj1LPzJAIPhRhYfbgeiDYQRBvOqeFIrD3hDw== 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 4Y3ZkT3nQYzTlx; Thu, 5 Dec 2024 00:18: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 4B50IvnP013512; Thu, 5 Dec 2024 00:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B50Ivum013509; Thu, 5 Dec 2024 00:18:57 GMT (envelope-from git) Date: Thu, 5 Dec 2024 00:18:57 GMT Message-Id: <202412050018.4B50Ivum013509@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: 3f960a05ba00 - main - loader: remove check for 2M alignment 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 3f960a05ba003870ee51e037ab18006511f12f8c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3f960a05ba003870ee51e037ab18006511f12f8c commit 3f960a05ba003870ee51e037ab18006511f12f8c Author: Ahmad Khalifa AuthorDate: 2024-09-30 17:31:32 +0000 Commit: Warner Losh CommitDate: 2024-12-05 00:19:18 +0000 loader: remove check for 2M alignment Instead of listing every arch we support, always define EFI_STAGING_2M_ALIGN to 1. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1446 --- stand/efi/loader/copy.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index 485ec152ae21..935db3a420ba 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -178,12 +178,7 @@ out: #define EFI_STAGING_SIZE DEFAULT_EFI_STAGING_SIZE #endif -#if defined(__aarch64__) || defined(__amd64__) || defined(__arm__) || \ - defined(__riscv) || defined(__i386__) #define EFI_STAGING_2M_ALIGN 1 -#else -#define EFI_STAGING_2M_ALIGN 0 -#endif #if defined(__amd64__) || defined(__i386__) #define EFI_STAGING_SLOP M(8)