From nobody Mon Jul 15 12:38:07 2024 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 4WN1vN2L1Nz5QrM5; Mon, 15 Jul 2024 12:38:08 +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 4WN1vM6v6vz4H44; Mon, 15 Jul 2024 12:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047088; 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=NsGZPPBPbSLJtlPtKFUbBlUIe7CX1/TsFgZck0zU4gI=; b=q8SEcxfblMtnH5GJHbaD6zxZTuK7BfMB8R40Dq8YIl0gvGmwKLDcbdj4LsihzWpxeDQODL 4hvkZLpGPLVRa2ZkETTffKZVskiG6sl8rQPVQW4hBq3cqFM4V2CiiXeseSTyi4LuFeDnic qw4zqfv9WDonxgDnEsnaI8TfSEKk771wKDjqfVJMU9YNcS0A5xilpCYJIVkxXLHkul/6jS i9LpbH/6YCSE/ca/0n2nGtjv5Jhe9pXS/NlEySE10l5yQC2tG3pPu6Ovgo52U5iiF81/t1 AXyfaWPjMH77Jw0iJxNUUuJVfYDsqMSpmMTmC8b2afZhtlc1rjXKeUp4ZlCrEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047088; a=rsa-sha256; cv=none; b=lVMPbY9jRr3luL9A8S/7/PuCwiZCYmvCG0bqlnFNPGoHpU+kJvj6nxqeMBUOawY7za2VSP oysYM3lGOZQeGj4rYkhdbZN+JoLLqeO4rUFjcVYXfjcdy4ZvCObWCoCtC4OaLmdLf63r8s EFP3Zjp+hlYezd2qBnd1UeuXgHCX5BywZKHfXzESs76eyFiy98s7GmoOqT0m4y2UZEvErD v1SBkf54JamXqyuL/zCF/EidGVJOWYk0sgVwUVJrUQkau48fDdymNZ8sewigLbI0p62Xao Oz3gCdnQIXuF3P4hqRUrAXT+sXuHkdjAbKhROZ+4gx8Tp4JfbEbLyQNKblY6FQ== 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=1721047088; 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=NsGZPPBPbSLJtlPtKFUbBlUIe7CX1/TsFgZck0zU4gI=; b=Ro2LVXmSSxicg9ll3TV0V/KsSM3Q2llk48GHs8FTUirEvUlIpzh/9VNbeVXtCqd3/GMY54 yfzweprU+/LdErcnsMtg+j/ql4Bd9L5k6F1TEEpfmUU4FKqqSi7f2neWsi2QTwCgCKMU4/ 2tUiH2jv5OvFlqfb9xIE3BlFQTmSqKXsXUxL2tbvetzLzgo4BQ8iSnMQ1bTmPz5YvF0vtp oOJe8NKORWCMIpjSv7up1GAigJC/CmgOJ/ZRZ3sIpL+8cjqRXUnzQPMN32DfAUBXgl66b0 SSJISddLBifPnVCaXIsyt093QpKWv/NW7ImCaT87FQLW5UnpOPC8UCuNHR7vdg== 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 4WN1vM6W9pzsJK; Mon, 15 Jul 2024 12:38:07 +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 46FCc7Ok059784; Mon, 15 Jul 2024 12:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCc7pr059781; Mon, 15 Jul 2024 12:38:07 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:07 GMT Message-Id: <202407151238.46FCc7pr059781@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: 5909ac43709a - stable/14 - am64: Allow cpu.h to be included from assembly 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 5909ac43709a83cac8b2d0a64b0dc2ecf4b9bb05 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5909ac43709a83cac8b2d0a64b0dc2ecf4b9bb05 commit 5909ac43709a83cac8b2d0a64b0dc2ecf4b9bb05 Author: Andrew Turner AuthorDate: 2024-05-03 16:07:29 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:24:21 +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 c84d48438964..0701a75d17f7 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -44,8 +44,10 @@ #ifndef _MACHINE_CPU_H_ #define _MACHINE_CPU_H_ +#if !defined(__ASSEMBLER__) #include #include +#endif #include #define TRAPF_PC(tfp) ((tfp)->tf_elr) @@ -200,6 +202,7 @@ #define CPU_MATCH_ERRATA_CAVIUM_THUNDERX_1_1 0 #endif +#if !defined(__ASSEMBLER__) extern char btext[]; extern char etext[]; @@ -267,6 +270,7 @@ ADDRESS_TRANSLATE_FUNC(s1e0w) ADDRESS_TRANSLATE_FUNC(s1e1r) ADDRESS_TRANSLATE_FUNC(s1e1w) +#endif /* !__ASSEMBLER__ */ #endif #endif /* !_MACHINE_CPU_H_ */