From nobody Sun Dec 04 04:39:25 2022 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 4NPv8t170jz4jF3H; Sun, 4 Dec 2022 04:39:26 +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 4NPv8t0XqBz4Hbx; Sun, 4 Dec 2022 04:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670128766; 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=UC7Q+Pq4xTbduNVJklSWH40zlgsVqnGQ8EyVBY3bPeo=; b=sjPalz8DSEnNO8p+rhXQxGw8dH0n8FVSvf4kw331VGyIEl0R6PsIPT3RZY+B1I739xASqY hGtme6uBW4ogPiR4g72OijpAF2VHmLlTjicduP07ovasPEluharCZDTc308MHwqG0Nsruf 848PB08w3nYNAKIRDcV85n+1nIY4FSh7Dx6ss9Buydoz2hL9lrsMoTGW9sh08rzzSl3wzc Lk1gKJeUIcbP5gi2piEaDVFN0shMqFY9cBELRqfu6nFsn6m6h1jAzUmWWZmY11nYsHiiW8 xUBFiWFQ4Dn8gx4S6N/efkfe3h4CnZQSi8Ced/biD2Z5GmXRRlZSqfApO/T/ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670128766; 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=UC7Q+Pq4xTbduNVJklSWH40zlgsVqnGQ8EyVBY3bPeo=; b=XjzC3FgW4AdksSZVQ6GDud0HqPzB10V0aBtK9tqhl9QxLGg+04FOpMi6HR5O1BnLtOsHS5 J7+tzRcIHH41IL4aNNMgBfluKGtn3ma6UUkfaL46Bfyj5GfJlXfflFZ+PbHwrFExlyKYIf jDdpM4R8ycUXEjrM3S474FDV68WPnxjbo7TS/jZGF9Bz+qlal3As7mgXZrKes4tl9TJgnf j+oZElNjCBJNgo2G8+4qHMpvZMKNzq7sOhCkdgI97TWL26jw3cCPe6YvYU7HWgm0zSZX9V dsZyq5++S23JSx1Lb20rJzUT1jyOthYA+TArRUVaBRxduYtkcYSeTVEXgRVHvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670128766; a=rsa-sha256; cv=none; b=Ew57IT9QSL+UztYk2evbm3CPfjQM037nQHFWhoZ9oqail27o8dkx24GXOhtdjwjRT09kVm dKnuvENrZ15leXJi74CwGtTetcy+htIGOXnpnGrYxI1XU+duldx3sPSp8ExTLJK+0i++Mw rTtGc/fiD3OpTmoTKqSlvqKvjxpUWt3DfOjFzGCJCZy+ohi0U+lv/63X9maNxFTFA+LmOK IbPGfNmZ+ZwbrW33jQsuM30OcVhGQJlOK5OPNvgCe9lTxK9JUDDDn3ghlQbHTqUIH7QxDS SagFO3iTtnKumsoandv0hJbg8kuIJcGQO6Awx1hwWisqD8RLoJ5+Yi4CLz2XJg== 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 4NPv8s6mNnz1LM2; Sun, 4 Dec 2022 04:39:25 +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 2B44dPx4074156; Sun, 4 Dec 2022 04:39:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B44dPg0074155; Sun, 4 Dec 2022 04:39:25 GMT (envelope-from git) Date: Sun, 4 Dec 2022 04:39:25 GMT Message-Id: <202212040439.2B44dPg0074155@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: 3f2c1eb5b843 - main - stand/efi: Better include order for sharing 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f2c1eb5b84317bae98420c1346304b604436727 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3f2c1eb5b84317bae98420c1346304b604436727 commit 3f2c1eb5b84317bae98420c1346304b604436727 Author: Warner Losh AuthorDate: 2022-12-04 00:23:22 +0000 Commit: Warner Losh CommitDate: 2022-12-04 00:23:22 +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 --- 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 6e109fdba98f..4d4e50718f3a 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)