From nobody Mon Jul 24 16:58:50 2023 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 4R8mZy3Vtbz4ndyX; Mon, 24 Jul 2023 16:58:50 +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 4R8mZy2YMlz4GZw; Mon, 24 Jul 2023 16:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690217930; 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=1Wo2KrxqQnMrVNqeSKeN/O50ekCrPTr95aVwb14xUFA=; b=tCw9gnp9NNiRMq35iCpIKRKOKLqBOHCrO84EdMPy8oBOccCQzhw9EdoUyUglZJXh+oZ0dR Nhc0URPRRnX6irU7Crn3Jua94/LZo6RiUpPUrHJovmWtvTPQy8v32k9zvUEKOXykRTTcFg JuIlZtpj6RiAYa3RgsxnzSRlk2n+lgxQrjJ08TVICQUU3akd9dj1Cx+6J8kaYt0HQL9szZ RDLa7dCMw33dpWU6qn/LnaHcq7HXV12N3tNtGLOXahmvRDTqc8A8kHymcR7/sbcIf/ScKE ecLlt65fU+2sFJvvTs2nOR4L0qVg/CZwolCgQL94taO/E8iJamjdNsEDMIoDig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690217930; 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=1Wo2KrxqQnMrVNqeSKeN/O50ekCrPTr95aVwb14xUFA=; b=tdBYvLpIMmFMtQ7x1qvfa3UAN0qCBi45WpLI0/AUK0cYRhvGNhdyG2WyN/xITpET0ukOS4 8YijP6nGh4qvi43oe8xqhEeKHBtxhLqMtF0sq77qjaHdMGF4iCrrBqgHiaY08SvADl7Rc9 mfXazirEMdhg0OyDvFHwB8SpqUv/eT69G66mfieV4ytvABW0MkdvFVwEuvZ1sRTQAEpDtb 0dy1sEc0pN5aNy6csShuSBDpbkhjKpya3j/gtXchVOuQfG9WJIUowPRo5bAtvhG2q06Hep yeWRgejcKNTkYTo5M4nJCsFAKXc1d426KsigCngFldY+Xn9MJDFIctPEgxwOgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690217930; a=rsa-sha256; cv=none; b=J1J5lpdzPa925ux1g6/ABu5goOlzYHeE+EbVOvyi2MR6WB8SiQ4Y1AMqK+eF3FC0wy1LA/ +My7F8ffwkNBshMxOdRGfucbtCU6w/6Zg1GTFttikz17/TFzfeow5jHWHxVyYu2ftN7dtN Q6S12dpvZI4AlRFVxPm32X+X7TBwDeuc1gcC7j5jbBL6p3kWNnhZPeyULvrczjf5xsLQ4x ji6tqID9YruNGKb2+WrO6jsnD/xxzc00ArSdDBH8Dm9sFYpXY9XexpyrKtpfs6KoioOLU6 NaJmcTVsYbTHBypYt9+DSKCpVtnfy3RexGZdSajsi16Z7xL2SHa2jETbjk49gQ== 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 4R8mZy1d4vzQ3j; Mon, 24 Jul 2023 16:58:50 +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 36OGwoqp096765; Mon, 24 Jul 2023 16:58:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OGwowj096764; Mon, 24 Jul 2023 16:58:50 GMT (envelope-from git) Date: Mon, 24 Jul 2023 16:58:50 GMT Message-Id: <202307241658.36OGwowj096764@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: 7a165460252c - main - arm: Only include sysreg.h when needed in asm.h 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 7a165460252c04cbdfb60e3e86b788dcf4b72e9a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7a165460252c04cbdfb60e3e86b788dcf4b72e9a commit 7a165460252c04cbdfb60e3e86b788dcf4b72e9a Author: Andrew Turner AuthorDate: 2023-07-24 16:58:16 +0000 Commit: Andrew Turner CommitDate: 2023-07-24 16:58:16 +0000 arm: Only include sysreg.h when needed in asm.h We only need sysreg.h for armv6 barriers Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41141 --- sys/arm/arm/cpufunc_asm.S | 2 ++ sys/arm/arm/hypervisor-stub.S | 1 + sys/arm/include/asm.h | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/arm/arm/cpufunc_asm.S b/sys/arm/arm/cpufunc_asm.S index 94b34714bfe4..3f4d415b56d8 100644 --- a/sys/arm/arm/cpufunc_asm.S +++ b/sys/arm/arm/cpufunc_asm.S @@ -45,6 +45,8 @@ #include __FBSDID("$FreeBSD$"); +#include + .text .align 2 diff --git a/sys/arm/arm/hypervisor-stub.S b/sys/arm/arm/hypervisor-stub.S index e7268e6465c4..2202edf6b4c2 100644 --- a/sys/arm/arm/hypervisor-stub.S +++ b/sys/arm/arm/hypervisor-stub.S @@ -29,6 +29,7 @@ #include #include #include +#include __FBSDID("$FreeBSD$"); diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h index 72bf244c449a..e2e71e13b643 100644 --- a/sys/arm/include/asm.h +++ b/sys/arm/include/asm.h @@ -41,7 +41,6 @@ #ifndef _MACHINE_ASM_H_ #define _MACHINE_ASM_H_ #include -#include #define _C_LABEL(x) x #define _ASM_LABEL(x) x @@ -194,6 +193,7 @@ #endif #elif __ARM_ARCH == 6 +#include #define ISB mcr CP15_CP15ISB #define DSB mcr CP15_CP15DSB #define DMB mcr CP15_CP15DMB