From nobody Tue Jan 24 22:13:46 2023 X-Original-To: dev-commits-src-branches@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 4P1h7t4KQYz3bggg; Tue, 24 Jan 2023 22:13:46 +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 4P1h7t3vcxz3JFS; Tue, 24 Jan 2023 22:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598426; 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=GPpsbXypcmx2s4pmQ4I1G1taffMHaQoLUOi0JXQ4yXM=; b=aLMTuL+D5ZloFl9aNk6iG1T4Xlwz0Q0suYJpvsx0YOo/+8IE6EgCLCU5b6CiNun1GRrBap y1B8TOIclq7M644jFNZDtPp4PJvk3GPnir2LpAFTt6UKjqBbER4V6hU3r/QF+e1CHpOsrJ rnm+PRtdrjjIgl8ZBWHIP7d4ZtAdAqX0Jnx39T2ZB6Vn+ABXZVNxP0ANO8oP3abgltunQz bML8c3x/ZOrP9xHwaZDHoukzZLbHyEBTrtqAkvv1I2cPYuKxrB7PzMukL+7PDph2cgZgEk uLHfwzubx8dB/nRP2Mb9kmT6oMBngkI5IbcePsxNZ0WZBBDZ9P32xuWVjaFb7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598426; 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=GPpsbXypcmx2s4pmQ4I1G1taffMHaQoLUOi0JXQ4yXM=; b=nVdlxP+DaIsQZzqUjBgrHlmKi3Wl11gMETQEGOrMAgk57TTRlXgMUnGjfnUJUpfrePiMjI dJ3is3iTwWkThDIHy7j1iNeuEqMeEpI3LScjeTYohmRyepR2N8KJVUexJMmBWYDVQRZKW/ /42jIm4blElvBf6Wl7foecrKd8AepynA2g5S5sjxnbRBf5roTUEKP2Hm3F8M45AnQ0gaTY 6Uy89uhVHlJEYHkNRcFWQrfvaTwVUusYHOapZocszZW3d4pg8n8cSXUWyHvLvmPamYt+ff /+zGQGoFl4qffOaJHUUuibfrGPzN+IMsfjEGvpK2VfteG/5U6/RjdGI5OXYgGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598426; a=rsa-sha256; cv=none; b=Li0cn8KpzPX8ppRhitw6odgXvjK1s6BZP/ICI9HC/MVlKsBratozV4LutEgZgxb7aBSMNJ 2D6QZj+vpuk2j4XKd0khqiEPcBCEkqimIjZ+85AbUqin2xIvnIV2B3Lx/iLIY9qnFqFLYx 4FWFWJhXlGE+/V9EhvexcBaC/kqG1uqZWQ6xb8Z7S6Z0Z3ROf7v83h1YnUaUJ5JZ226Prh LT3C1twV50na0Wm9ttZsPwQ3aagGFSeK71uMcTDF8AOvWIip5dh+p7wDiMLzBVgocyadd5 6SfCzGCvgOoJZiFuIige3FtsvG/aR3PQheQLDepoXTwpeAEM1sppZlU8uS4iJg== 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 4P1h7t2sKSzQhC; Tue, 24 Jan 2023 22:13:46 +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 30OMDkoT088884; Tue, 24 Jan 2023 22:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDkQs088883; Tue, 24 Jan 2023 22:13:46 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:46 GMT Message-Id: <202301242213.30OMDkQs088883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 374952d9911b - stable/13 - stand/efi: Better include order for sharing List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 374952d9911bf362c97751d93311df9e1c9457dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=374952d9911bf362c97751d93311df9e1c9457dc commit 374952d9911bf362c97751d93311df9e1c9457dc Author: Warner Losh AuthorDate: 2022-12-04 00:23:22 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:42 +0000 stand/efi: Better include order for sharing Have a better include order so this can more easily be shared between EFI and kboot. Fewer ifdefs and the same (enough) include order as before. Sponsored by: Netflix (cherry picked from commit 3f2c1eb5b84317bae98420c1346304b604436727) --- stand/efi/loader/bootinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 8daa00660e17..2187a09c1ebf 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -45,12 +45,12 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "modinfo.h" -#include "loader_efi.h" #if defined(__amd64__) #include #endif +#include "loader_efi.h" #include "gfx_fb.h" #if defined(LOADER_FDT_SUPPORT)