From nobody Tue Mar 22 16:08:12 2022 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 931AE1A2DE73; Tue, 22 Mar 2022 16:08:12 +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 4KNGcD3Jrgz4qqS; Tue, 22 Mar 2022 16:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647965292; 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=7i9M3o27uNF3s4Azy46/Jf87yAwZru9if8bpb3gRXbo=; b=EVkncf5WfJm30Nh4F5mbB6G61WBkF06SGk9sPIv9FND4VQxDSGUyJ9YJK3ImJuCCfOGXWf eVdvjI/JmGP7knX0cFPcH2Q0FkYSUdABpgvpK/F+WBbuk/CBo7AwD9AdrLQWTYvc54Uqv2 8GojB+koEtZKjdIlapXqKVDZzwI4awJTzl5y0Svk8vmuSnZ5t4wdD8f+zR6zqIEBSqtCov /MQiTBgSTs8ovXq4qFqSEakwfpEndF2MMUXfG+ywPNDhe+ZpFM/nSyW+YOZMtjQKDw013N zGXf3q+3sNlg74bLQo5xOEctT8AMWRIPwqZUlJzlI+uR55CTxdLF+58P79AxRA== 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 5193B12910; Tue, 22 Mar 2022 16:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22MG8Cat071051; Tue, 22 Mar 2022 16:08:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22MG8Cw0071050; Tue, 22 Mar 2022 16:08:12 GMT (envelope-from git) Date: Tue, 22 Mar 2022 16:08:12 GMT Message-Id: <202203221608.22MG8Cw0071050@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: 83961b7ede96 - main - Remove the unused arm64 kernel profiling code 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: 83961b7ede96e61f384f325bbbb38a99513cc9be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647965292; 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=7i9M3o27uNF3s4Azy46/Jf87yAwZru9if8bpb3gRXbo=; b=LWvLHnG2wJSzf4HVDtLNPn6QArkqu3ZFnO757F2wkRpXZ60lec+ldd69FHAcN7u1H247c0 8A9e1U0TYDi+cGfveBWTDA21c721Jp6oT2mLKhOIMNYTyzMyoBuu/4qh2ZCNQhslXVJ5Bv etUzpxF7iAjCt6NbwJ1vUnF17zHPndrLYnOXX56EvrqZWaIxAOZUyImi7vZIWXS7Ks/H8o SqRkW8oJIv/OQ2r2WajavcIGcgsfsfClTnt5Ox394rHPPNXehWW1yoMnM8OPJZP/gklNO8 vWGmy6HV6LrW/nPayMwvbF+PGtLXrzkUGZkDjJMvGTPvUwrc7jvpBsqMdD6nCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647965292; a=rsa-sha256; cv=none; b=KreSW0QHiIC+Odif8Mk7cV0wzQYQVaPOnKNKxcNdlYX/8MxpLwUxn4nSts/pP9HFOjSu6X Q9gZrZfsfrInYq8DWLcFZcJ/bbG6UwfUt+St0VIO6he+ECc4xPYvVuQQHDzm0+5FVwkZjf 5XHbLVCHDwdCk/MRnaO7iAApnZHdOtm4EufUO0YoL6CM/QQt/mC9HIWO7+EkA4gDTVQOh8 OtQm93H1cXwIGGWQQ95bPiwOuQULxhtkQry16kcP5LOOIsgQ++i+NtZBIW/Rs0FZJZR2z4 6ZkIvTCwuXwz7HS204Dez5ArLjbP2A5ywLTDxdrnSLnLFkS9lgppnxoJ0ri9YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=83961b7ede96e61f384f325bbbb38a99513cc9be commit 83961b7ede96e61f384f325bbbb38a99513cc9be Author: Andrew Turner AuthorDate: 2022-03-22 15:48:58 +0000 Commit: Andrew Turner CommitDate: 2022-03-22 16:07:54 +0000 Remove the unused arm64 kernel profiling code It's unused. Remove it in preperation for userspace support. Sponsored by: The FreeBSD Foundation --- sys/arm64/include/profile.h | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/sys/arm64/include/profile.h b/sys/arm64/include/profile.h index afbfbdb44c0b..86a9703437e7 100644 --- a/sys/arm64/include/profile.h +++ b/sys/arm64/include/profile.h @@ -34,47 +34,19 @@ #ifndef _MACHINE_PROFILE_H_ #define _MACHINE_PROFILE_H_ -#if !defined(_KERNEL) && !defined(_SYS_CDEFS_H_) -#error this file needs sys/cdefs.h as a prerequisite -#endif - #define FUNCTION_ALIGNMENT 32 typedef u_long fptrdiff_t; -#ifdef _KERNEL - -#include - -#define _MCOUNT_DECL void mcount -#define MCOUNT - -#define MCOUNT_DECL(s) register_t s; -#define MCOUNT_ENTER(s) {s = intr_disable(); } -#define MCOUNT_EXIT(s) {intr_restore(s); } - -void bintr(void); -void btrap(void); -void eintr(void); -void user(void); - -#define MCOUNT_FROMPC_USER(pc) \ - ((pc < (uintfptr_t)VM_MAXUSER_ADDRESS) ? (uintfptr_t)user : pc) - -#define MCOUNT_FROMPC_INTR(pc) \ - ((pc >= (uintfptr_t)btrap && pc < (uintfptr_t)eintr) ? \ - ((pc >= (uintfptr_t)bintr) ? (uintfptr_t)bintr : \ - (uintfptr_t)btrap) : ~0UL) - -void mcount(uintfptr_t frompc, uintfptr_t selfpc); +#ifndef _KERNEL -#else /* !_KERNEL */ +#include typedef __uintfptr_t uintfptr_t; #define _MCOUNT_DECL void mcount #define MCOUNT -#endif /* _KERNEL */ +#endif /* !_KERNEL */ #endif /* !_MACHINE_PROFILE_H_ */