From nobody Mon Jul 15 12:38:13 2024 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 4WN1vV2FRxz5QrVt; Mon, 15 Jul 2024 12:38:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WN1vV0Bpfz4H6R; Mon, 15 Jul 2024 12:38:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047094; 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=tKJCwqE3QXSYPWXXivmEgsyfvBZNV2Mq5pTJPRWRtf4=; b=s0RjbuQAgGNJx/T9TSbxsiGFoQyQqE8Soep/00gm3omrzjSmGce2uzoDmcAlbwXCS+Ktqe B9bfuR2bHc8l/lGXYqdnJY54LADqwF6IffHTwzk6hBZgFLxwizqSup1znJR/Aq5JIFVF8c u4ER9w6m2e8FuQGCJ7SQIoaSR6MFfArhBJvx2piqlgtAcahtpAgkBoVdQ6DNJWd2O4Y9Su EfLnl/BT6/RaIPFj3DL53dMK2+QJRHFUd3CpPUL+GfRos7Vd5gFZb1FvoN3LmBKre/VVjq oZHNnoXKv42TfcV4TArZsmc4bxk6yKoPFoy7aV6+bpHbEuSRmczf3Yb0rHsE1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047094; a=rsa-sha256; cv=none; b=OFKd3yHhH8umo5WfdNwOOtQAc9y7ZCW30yBuO30M/z6doism+KBOkBXv6Zs7M87bVDu8Bn isoTF6LHxYnhOk01HWQrx8Gh6rl8ciniG5XP/1AmBRGaqMrf59g/gCw/aZgpKOoX5HiRgz Yi33c8FhMP3fGeRODDNT3cSX5nD1TsQKRNEFQ+l9c8hQ2BxH8wgwgOMjtWAbHi9gFn93iH trGs6a59dxHRvin5z8DzmgNkzSNkJklgqb23cTYrUyizXYxRw5oqHki+yPzFcqkQF8LsFm F2SV0jbBJek4lbldZgpQ2glM1pnX75rYO1qoP3KUL+R8gFQSqpCMu+pneUji5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047094; 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=tKJCwqE3QXSYPWXXivmEgsyfvBZNV2Mq5pTJPRWRtf4=; b=iwG+QwdRsuHvCQl7HmOItNPlh2YaokByYx51a0ENsGP74dC0FLzbzU6fI9TwkNrKiECv5l kX9PfYcg2uCB+oCTL4iFkD2XWbuJd+xmFXR11eEebtAEgSY79HEzy94XxC6OkFJdfQF8S4 vElriWQpvlH/EjmiQ6Oc7bqHnOQxK02RaU65SzguMCW21D/BDQP3qQNwjwqaefLE0TzEhu u39ApETEC1l7IElNfuiA5Fmf9pdkjPJZg2ruZ+PCqGNqKKdmg/JMvCkrw5eovb1DTAE8zt NiobAEhccOw2YiZigt0wlbG3A0DuSD1OPQUgkKXjT/vrz5N03pHrtVhkxtZ4Ew== 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 4WN1vT6wzczsp8; Mon, 15 Jul 2024 12:38:13 +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 46FCcD3V060318; Mon, 15 Jul 2024 12:38:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCcDsg060315; Mon, 15 Jul 2024 12:38:13 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:13 GMT Message-Id: <202407151238.46FCcDsg060315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 23fd9f3e934b - stable/13 - am64: Allow cpu.h to be included from assembly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 23fd9f3e934bc933e12eb7dcf01bb503be9ba0b8 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=23fd9f3e934bc933e12eb7dcf01bb503be9ba0b8 commit 23fd9f3e934bc933e12eb7dcf01bb503be9ba0b8 Author: Andrew Turner AuthorDate: 2024-05-03 16:07:29 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:34:28 +0000 am64: Allow cpu.h to be included from assembly Reviewed by: jhibbits, kevans Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45081 (cherry picked from commit e353ac0cfd5d155c01253ee17c2bf23f888cb7de) --- sys/arm64/include/cpu.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index ceccdf95ee8c..de6741fef1e0 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -40,8 +40,10 @@ #ifndef _MACHINE_CPU_H_ #define _MACHINE_CPU_H_ +#if !defined(__ASSEMBLER__) #include #include +#endif #include #define TRAPF_PC(tfp) ((tfp)->tf_elr) @@ -177,6 +179,7 @@ #define CPU_MATCH_ERRATA_CAVIUM_THUNDERX_1_1 0 #endif +#if !defined(__ASSEMBLER__) extern char btext[]; extern char etext[]; @@ -227,6 +230,7 @@ ADDRESS_TRANSLATE_FUNC(s1e0w) ADDRESS_TRANSLATE_FUNC(s1e1r) ADDRESS_TRANSLATE_FUNC(s1e1w) +#endif /* !__ASSEMBLER__ */ #endif #endif /* !_MACHINE_CPU_H_ */