From nobody Wed Jul 5 10:11:46 2023 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 4QwwS31G05z4lNHD; Wed, 5 Jul 2023 10:11:47 +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 4QwwS30pYtz3JXq; Wed, 5 Jul 2023 10:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688551907; 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=ec33dULY45qZVEooj+eI8SU+z59may4IAb55c+l+n8M=; b=QdlcMXH7ozeAX3PSlgedQ/x0qryVO29JiSiMHAY/7665LWH7VbBVVrpvxrbu73m8YxZ4dR OpTY0Z8q55UCvvTVOQob3XL/jl47Q67dDoXQn40rL0Wq6SOEncafwkHrJ39za8bzOhcmcF Q5qJjzwx4VRh5RtNFShKV97hR64gccR2Jf76Zf0xQBgQKkt4baRQz/vU5wyQBgXQxzUzmF Hi52IiVI4VwRRYuEMMipD1YaZcGUQYNH3hV+clog+wTc6dwQA6t5I8j2bxHsk0EowdZxV0 061BNQIJ3cdatEAmD7KOwrX9bJlQ2dtfj5UylY4Y2ubC3T8xsf8dqh5dGNmK2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688551907; 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=ec33dULY45qZVEooj+eI8SU+z59may4IAb55c+l+n8M=; b=hHzlJd+F0VA/HZgyG1jTSvqzaHcpPRUMZjdNRYP23M4/Jjz5L36vqUmQnVElZDRJoz9W9t 6ExW6Ma+0ft2skpUJ9iZ0o1zaaHWTZwXMuWfs6BOe1+51CQU0GfHHkxJtg8QwuMtnh54lD 9pA7NL00OVqKGJDgpMy8oAy+5+gcsdmPgVByDJcrtz9pcHJFnn2atpGGG1++Wpl5z6gp9r YE1DmLghx0tVz/b5jUZa0ZpJWGH12OAEo6HzhBnZWCr/B/yyDHSNyXb/iofItpPByCgYcd H4kfvVOZp+DLgzHrDRClY/NdxigB1udMYi5hFGPiz5vQAsmnDn0XbvVptXji+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688551907; a=rsa-sha256; cv=none; b=VbxbWNzq2AHEvG+l2DeViR5711AiH9gfSy22JPhfXsq7JRXf8GiB7e/UP38UKuveJULC/p zaQLYDbZiV2m/rlP73LLzE3LQ9shAUCk9rYq6k7R26uPe4NpnZy1hHQlE0vUjcSMZym6HB 6u4bweYC4h3rpusqxQTmqF4+TPfnBJbfs1w+S2Q7ZIoFalLyviISneBZW8QLUL4XVGiOGh EQytMthlpjzU2HXCSHFSRMprt3vRbpTrE70qgUpStCAyAlxNDz3qVSvaCRsA+2o/X99Vqt oXtl5CNyu6Ee+QK9nF7m6Wf3wTgkYcySCwVpvzpa3HEpVfM2GYi0iAjMGooHZA== 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 4QwwS26zprz19wq; Wed, 5 Jul 2023 10:11:46 +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 365ABkNP087127; Wed, 5 Jul 2023 10:11:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365ABkk2087126; Wed, 5 Jul 2023 10:11:46 GMT (envelope-from git) Date: Wed, 5 Jul 2023 10:11:46 GMT Message-Id: <202307051011.365ABkk2087126@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: 51fc92e68e9f - main - Make some arm64 debug monitor functions static 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 51fc92e68e9fdba5657cf5fa4dfff1a63215220b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=51fc92e68e9fdba5657cf5fa4dfff1a63215220b commit 51fc92e68e9fdba5657cf5fa4dfff1a63215220b Author: Andrew Turner AuthorDate: 2023-05-22 13:38:08 +0000 Commit: Andrew Turner CommitDate: 2023-07-05 10:05:38 +0000 Make some arm64 debug monitor functions static These are only used within debug_monitor.c so can become static. Sponsored by: Arm Ltd --- sys/arm64/arm64/debug_monitor.c | 9 +++++++-- sys/arm64/include/debug_monitor.h | 3 --- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/debug_monitor.c b/sys/arm64/arm64/debug_monitor.c index 52bcf1e5e603..be79f1184fe9 100644 --- a/sys/arm64/arm64/debug_monitor.c +++ b/sys/arm64/arm64/debug_monitor.c @@ -62,6 +62,11 @@ static struct debug_monitor_state kernel_monitor = { .dbg_flags = DBGMON_KERNEL }; +static int dbg_setup_watchpoint(struct debug_monitor_state *, vm_offset_t, + vm_size_t, enum dbg_access_t); +static int dbg_remove_watchpoint(struct debug_monitor_state *, vm_offset_t, + vm_size_t); + /* Called from the exception handlers */ void dbg_monitor_enter(struct thread *); void dbg_monitor_exit(struct thread *, struct trapframe *); @@ -380,7 +385,7 @@ dbg_find_slot(struct debug_monitor_state *monitor, enum dbg_t type, return (-1); } -int +static int dbg_setup_watchpoint(struct debug_monitor_state *monitor, vm_offset_t addr, vm_size_t size, enum dbg_access_t access) { @@ -447,7 +452,7 @@ dbg_setup_watchpoint(struct debug_monitor_state *monitor, vm_offset_t addr, return (0); } -int +static int dbg_remove_watchpoint(struct debug_monitor_state *monitor, vm_offset_t addr, vm_size_t size) { diff --git a/sys/arm64/include/debug_monitor.h b/sys/arm64/include/debug_monitor.h index befc51e88304..22ed8b5f0e24 100644 --- a/sys/arm64/include/debug_monitor.h +++ b/sys/arm64/include/debug_monitor.h @@ -56,9 +56,6 @@ enum dbg_access_t { void dbg_monitor_init(void); void dbg_register_sync(struct debug_monitor_state *); -int dbg_setup_watchpoint(struct debug_monitor_state *, vm_offset_t, vm_size_t, - enum dbg_access_t); -int dbg_remove_watchpoint(struct debug_monitor_state *, vm_offset_t, vm_size_t); #ifdef DDB void dbg_show_watchpoint(void);