From nobody Sat Oct 31 03:18:53 2026 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 4jGjqK31Dgz6xqM0 for ; Sat, 31 Oct 2026 03:18:53 +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 4jGjqK1t49z570t for ; Sat, 31 Oct 2026 03:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793416733; 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=dqu3vQA63IIl3Orewy//pON0vX7yPXfWwXZn+cxsepE=; b=qF4qcPloK4Apn3CY0m/sYwDU6Qz9DDbrLIvyPe7GFU2bmm9ApnBbtZfaR07xJUMKRsEIpx kQVsAS8z25qWSU/K1KUhvZ/fSRpYhwYU6rBAPq8Q3I6NIHmZhjfEfHmRHLfrwLnSIfSU1H FnsiB6UCF2VLwaq9QXv8oYb2uZ/zgpxLYCCTdMRoow0ia+A8eurk0VYmOOfala51T8MQdw kZMIQYpv7ZWAkoAHvjAeuoYFUeEo/X+bAu2sJPAWvYOPidJaa0S80Xyw1/nk21F03ETz1E dy3fIklijPSx/o3RdT+DGJy4Sw9YSnpAB1KzsxGOJtfxRrYgKBevlGndCSBoHQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793416733; b=ARVqxBd+dmi9XoMyNnDlwKVYWtX2+0xikcPcphwcAGOF0dhFOJaxy55D9H8uphvD33Mc9j 4Zw/o8CAiAqAgeN0IvhtwfaJQoIxPWQtWbMETRLmfR14qakSXQiJFb2cElew2IogrXtPxI ot9G7O+HIzBWzXXKzp84FPrFRwPI1hap4Ant/VU7nZTrJZyjlc7uoifBA1sbqBbkRMLBHk INFtMuhvpeOAZTgSbQ3gC0oEirvZJkbHMg5QKqcAbaqYRk340bVVF0Z8089v9uYM2ashAz nVzb4gku8BXVGC+7Uk0JQOXNVKUK+boS98KTI7olpZCFSP2jlvA+0igN1e8/zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793416733; 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=dqu3vQA63IIl3Orewy//pON0vX7yPXfWwXZn+cxsepE=; b=Mc1JWyuktv5+hEHi+kaYdi5tgu1+eHrBh28NYSSwsUs7XHV/1uLxgd18AFXHwAjLmN2uh9 Zw72P7S0L/VgP/A/i3yfax05Sxja/CGc72gL2WhF8ZJj+viQy2L1b7TQza4N3IQ7B1Bda/ FDXJ4Zd99x28fcg55I7nxC5G6k2Kov6hpg6P82JEMwGIXXYdc+3A5wbmGgITci8Ubhi3nO EuwLl52GbLLrBm4h+n5pkhbgPsAsmNuXQ7QRJqzKgK1A6gAw8qvPXWrBvrVxndGggtzNOK Agk9WSFGyYYgX1efoZbJ2r3AY4DOqzygLYi2t1yzOX0r4xJHeVh1SaSYgVrt0g== 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 4jGjqK12ylzx1T for ; Sat, 31 Oct 2026 03:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36e4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Oct 2026 03:18:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 66da93680c97 - stable/15 - x86: make machine/sysarch.h usable from assembler List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 66da93680c97645f23b1ce0232c6c3caa9c52824 Auto-Submitted: auto-generated Date: Sat, 31 Oct 2026 03:18:53 +0000 Message-Id: <6ae55e1d.36e4b.337ea75a@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=66da93680c97645f23b1ce0232c6c3caa9c52824 commit 66da93680c97645f23b1ce0232c6c3caa9c52824 Author: Konstantin Belousov AuthorDate: 2026-10-25 01:49:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-31 03:15:21 +0000 x86: make machine/sysarch.h usable from assembler (cherry picked from commit dc1514eda55c5a2439cb5b8fa5c08e78468b7d3b) --- 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 8fda776a3b08..0b0dadfd006f 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; @@ -166,6 +168,8 @@ int amd64_set_ldt(struct thread *, struct i386_ldt_args *, struct user_segment_descriptor *); int amd64_get_ioperm(struct thread *, struct i386_ioperm_args *); int amd64_set_ioperm(struct thread *, struct i386_ioperm_args *); -#endif +#endif /* _KERNEL */ + +#endif /* LOCORE */ #endif /* !_MACHINE_SYSARCH_H_ */