From nobody Fri May 10 09:30:07 2024 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 4VbNrv4MD9z5J2SY; Fri, 10 May 2024 09:30:07 +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 4VbNrv3vKwz4FwZ; Fri, 10 May 2024 09:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715333407; 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=bXZt4j7qMkGUz7hpQ4HkW/JP17UR1+YU0JoAvpf43Ws=; b=hQY1UALU5oJNzEdBY97Qc8aImBdGj9DjUd+YJx2LwFno+E0ueD2rmTBlkvFGYXHkrNy+be xoqjwzkd9FW2gG9UyQtPfWkUPxY/9aIRoJpUI/VAv883sSf0DBRY548pQJ6Mg6/rz4bYSD iJpJTefzfSnOjQdFFixC47yAzVKKMfNacMzH5dkO8ipeyOPUQs1FKD+BZP0CWlJupkuU51 cjBd9hwB1k/WMfOqJBRPPQQLv5MMMudUzZnOG2mncttRSWpS0nfwdSGpdHfW9jfFyRv1W9 3VQgptqpndIB77huPoZ4fKBJvZa8nI7RVnaFpz+xEPkKWo4L0S1E0o5DKHSCng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715333407; a=rsa-sha256; cv=none; b=fKtf6WDgRcsOXL3XMLvL5lpLe2+5nu4+prKe5FXMonoBTUZyGIh8NbpmpW0F1EsbMehxjD 0GK965Hez551l73NGK4HjYr1cG9uJWofmTFbOr/vf9aH/YIW/wgrxatHDZJtX/k0DU1/rQ jA3oZPVhR/e+7BrvBLWLnzxbXFrFFyxbAvtV5G4ZS2xJ0SOsRlj8PwEnuAN2OMttzvc7JT Dfl9FmyPtzJXbANa6p+jGAFcfaiEnLqikA9NkbYgfgecilrXXrQj2f+arX0tHDa87hhxfl N7uKCN+Y/bjc0hSWBbboc/huB6PzBW8DnkDSj6M7eX7STinSbUY8e6AvLTwTUw== 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=1715333407; 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=bXZt4j7qMkGUz7hpQ4HkW/JP17UR1+YU0JoAvpf43Ws=; b=XdL4STf4PLh4FWZWV0sF9AtkOYlU2mhNpYDeTvZIePtothOqUpwKgGPzrYcaBV6QMvNjTU 9nvZUA+vRG71Bl6ZupX2/ZCNpgCJ8uK6b4CbDInmdQPmadg9f4dTw1oMXjlC9iQe0ONcwC sYaIWuGfM0R8DnNO0ao3Uh6+G8ubrvN7QrvSIBtuBF9vr0gtyUs5DLpuOQKWouFa9zKxaU jnIEbRW2JbSvxDs+6L1GiH+aTpUJej0lFdUh/WngBlDQSZi6aLtWVYX7izqA46pFpl+Oud Mj8YXvnF/xkGOqs9e5qpw79SQCPrimiVsuVV5HjJq17XPh/wC9dc91fzisZeZg== 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 4VbNrv3RNCzXnB; Fri, 10 May 2024 09:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44A9U7sl084229; Fri, 10 May 2024 09:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44A9U7B5084223; Fri, 10 May 2024 09:30:07 GMT (envelope-from git) Date: Fri, 10 May 2024 09:30:07 GMT Message-Id: <202405100930.44A9U7B5084223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: e353ac0cfd5d - main - am64: Allow cpu.h to be included from assembly 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e353ac0cfd5d155c01253ee17c2bf23f888cb7de Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e353ac0cfd5d155c01253ee17c2bf23f888cb7de commit e353ac0cfd5d155c01253ee17c2bf23f888cb7de Author: Andrew Turner AuthorDate: 2024-05-03 16:07:29 +0000 Commit: Andrew Turner CommitDate: 2024-05-10 09:29:24 +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 --- 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 8f5a9e3dbd3c..91ed3634c6d8 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -42,8 +42,10 @@ #ifndef _MACHINE_CPU_H_ #define _MACHINE_CPU_H_ +#if !defined(__ASSEMBLER__) #include #include +#endif #include #define TRAPF_PC(tfp) ((tfp)->tf_elr) @@ -198,6 +200,7 @@ #define CPU_MATCH_ERRATA_CAVIUM_THUNDERX_1_1 0 #endif +#if !defined(__ASSEMBLER__) extern char btext[]; extern char etext[]; @@ -268,6 +271,7 @@ ADDRESS_TRANSLATE_FUNC(s1e0w) ADDRESS_TRANSLATE_FUNC(s1e1r) ADDRESS_TRANSLATE_FUNC(s1e1w) +#endif /* !__ASSEMBLER__ */ #endif #endif /* !_MACHINE_CPU_H_ */