From nobody Sun Oct 25 03:40:01 2026 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 4jC2ZT4Mtyz6xMVQ for ; Sun, 25 Oct 2026 03:40:01 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jC2ZT3cM6z4Gdv for ; Sun, 25 Oct 2026 03:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792899601; 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=tCrCrb5YmGZyD7DQDabTTsSQ08XiRYiHGoCrBytsJFc=; b=GqBic3TfT1T4l98QvIm5S3/v9FaUlkHM1FeGTpA+4AOQxxQ261GqbpP86ieE3BmdMWVTch sMeWPwDVtAIxvL6G3FDIZeXUbFum+pw0QM/B84o2RM+p77/p+wgMJKXSszwF9TclKDNMPJ bzcUYL6wwLMQGw+QZcSRmwZth6RpPpbn955nuKPh5Cxddrhr6owlSpvl2WtUgcKea/v1eb 9CCPkQVGz3n6xJ7bZxdNgNKDESLkGIqhUcTg5M7plxUPS4JgogJRxhWHHeePJvFY3q9Vho ++MTOBKUG9MrYGikCSTWK2G45O7QD2+lTG+B3p7rR00DhrVehP0cVyfHr4kjNQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792899601; b=O0Hi6lwCbQqHFXQ3HLAkZ23fSth/JZwkPc3lCmYJ8f/xtz7XTCW5DmVqFgEPzaTQJbQOCt BeAaqIUh47L1r+nQ7+68m5ZZXX15lKlD133efs+NXTpCUK/uhIQc88L6+ctfy+VEfdzuO6 94qv442KV8PPcEUBvQCoqHuwEbtxRarCkN0vROvhdU1qAG16UofyTNcwKXvIYL6Nh3Pfbm qLzQB8y0/CneGWEpg3Af0xNeVfWHQhI0CQ8onSny0ohd/ostzkdhIgHTPZu52pG0rR6VIa 8oNaBp9pK6X/3ByG8AS4zA0hvHpLeh44ZKtPk0Q6eigNlsv9UUu6jxAhzZ2uHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792899601; 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=tCrCrb5YmGZyD7DQDabTTsSQ08XiRYiHGoCrBytsJFc=; b=QYrozWgtIu+GqpMkKdNCSCQChvmTa+QNTWH73gDnJIvpq7Y3RuV0bL7EYek5pKneHhNRCv EENqaG9jdUMBcpxotjI7guNBdmzDNkuiYjsL3D23Op/IP7a5sU8eBMdKmMu5RYCELxXhN7 fC9mwIznXn0waCXfB+noPsJkGcDB/lFdlx+D0ByLgXKxMS9vNC7Cbl4KlRIQPyojZdGWnO XWuWTuSrHRsV5H/rxi4TPMAKPX4PlhVKmqnuF1o61uYIThinsBMnQl6uBj+82F7SgU4fNx aif7RXFTkwnnYDoMtMDLGHUJQEMSobnQbIxv+b3FiR9C8rVEgzOPQhdFF0knGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jC2ZT3BkxzT0X for ; Sun, 25 Oct 2026 03:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d1c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Oct 2026 03:40:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: dc1514eda55c - main - x86: make machine/sysarch.h usable from assembler List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc1514eda55c5a2439cb5b8fa5c08e78468b7d3b Auto-Submitted: auto-generated Date: Sun, 25 Oct 2026 03:40:01 +0000 Message-Id: <6add7a11.3d1c6.65361864@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dc1514eda55c5a2439cb5b8fa5c08e78468b7d3b commit dc1514eda55c5a2439cb5b8fa5c08e78468b7d3b Author: Konstantin Belousov AuthorDate: 2026-10-25 01:49:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-25 03:39:25 +0000 x86: make machine/sysarch.h usable from assembler Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/include/sysarch.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/x86/include/sysarch.h b/sys/x86/include/sysarch.h index 094995239043..fa38de0486ff 100644 --- a/sys/x86/include/sysarch.h +++ b/sys/x86/include/sysarch.h @@ -71,6 +71,8 @@ #define AMD64_PKRU_EXCL 0x0001 #define AMD64_PKRU_PERSIST 0x0002 +#ifndef LOCORE + struct i386_ioperm_args { unsigned int start; unsigned int length; @@ -93,7 +95,7 @@ struct i386_get_xfpustate { void *addr; int len; }; -#else +#else /* __i386__ */ struct i386_ldt_args { unsigned int start; struct user_segment_descriptor *descs __packed; @@ -116,7 +118,7 @@ struct amd64_get_xfpustate { void *addr; int len; }; -#endif +#endif /* __i386__ */ struct amd64_set_pkru { void *addr; @@ -153,7 +155,7 @@ int x86_pkru_protect_range(void *addr, unsigned long len, unsigned int keyidx, int x86_pkru_unprotect_range(void *addr, unsigned long len); int sysarch(int, void *); __END_DECLS -#else +#else /* _KERNEL */ struct thread; union descriptor; @@ -167,6 +169,8 @@ int amd64_set_ldt(struct thread *, struct i386_ldt_args *, int amd64_get_ioperm(struct thread *, struct i386_ioperm_args *); int amd64_set_ioperm(struct thread *, struct i386_ioperm_args *); int amd64_pkru_update(struct thread *, uintptr_t, size_t, u_int, int, bool); -#endif +#endif /* _KERNEL */ + +#endif /* LOCORE */ #endif /* !_MACHINE_SYSARCH_H_ */