From nobody Mon Apr 08 19:04:35 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 4VCz6W6gWCz5HYY2; Mon, 8 Apr 2024 19:04:35 +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 4VCz6W4GSbz4gnL; Mon, 8 Apr 2024 19:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603075; 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=tZolYAtd6ohR7XaQDcDHpqjnkjjjEEYjcnrQFLshCmY=; b=av+lJTx/xuVK/AenUI07ARSd4g9LqWtfTIvLPZPqk+nWXFEfRPe0yw+24h1mLRphPakWzt svQ/yXz6LfalG+JmGEZw1XjTGtp0otqyjmyYzcO9nn0lCKEclPFeXvWQVvIEq3Ps/igRli UKHNH1IPl8HB3MQ5VEWh7dTVUJuFzOuOOts0aRz2fp71lYfGq5F2LJu0AhisgW+ZCiQWhM g4+nP6jIDt7CdQQTVOkoBVmjOoPGyaJDb9zcqIKcV1BswQWvejpTJ2GUj+87LAzYb3BXtp CrQ+MngF/sx3WuI3fD1tcvwovtILnScxdBHAjP6hkJuhKVoZgy1sRw7aQhd4+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712603075; a=rsa-sha256; cv=none; b=EG2mgA2VDJ92vzZervqAzywIQ2TpvnLK3VgpkblnjWxNs6NYu+oMGt1byZz3g+o7zOqd44 i1J0Vis67o00cRXKDJAeHT1X0TCiOqtODc51cUaznGAn++xY0wrAe1etcGjBa9jZFl4BRp 9fqKvR5R7RO9P28FX5XeWMhDyR/Ww8kVlNrCqSOucunSXi3Tl6MKmyJDckCHvSWPBRmX7X ovHpW+RbrIfzqICH2u8/bTuemwbAu1oXdAccUJ7SsvFb6qQH6rJk3Yl312kx0cmcpO4C3W 8KanRBL7xj5xFmNcPDTbMIcgRQ1E5IZWYxnE7CNaAq/v0jT938r1ipCGv4neMw== 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=1712603075; 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=tZolYAtd6ohR7XaQDcDHpqjnkjjjEEYjcnrQFLshCmY=; b=je+/lOBA99vjs1AL4jFstzWbJhnUILcmPUYH5VieiURJrEB64jqz0Jj68LxjPBEZuzHQM0 WrPtKtlTZTv9umDs4cpIYOD/I0MDtyY9/BjC/qNF4L2/yhTPiQXUo7Kv9dIqVse/XNsO38 zc3akAhamGlmxn8HATPhERRNLM8WeeHzYkjXPHwQL7/8eZl8Q7VDOCPgrNSU1LoX+o0L3M DsNkeMwzIEPn/ZJBUyZMcNeZoXsyuYfZXcLA4P7HEy2lUmgNm471KYxdFPWm+nvZEv135P AXg+pG4oySYVIHyEj6TJHJj3jdgOn12WL/pMOdUAVDhdIYv3xyzM6kLv1U3ufA== 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 4VCz6W3tkvzNQG; Mon, 8 Apr 2024 19:04:35 +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 438J4ZdB094563; Mon, 8 Apr 2024 19:04:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438J4ZMs094557; Mon, 8 Apr 2024 19:04:35 GMT (envelope-from git) Date: Mon, 8 Apr 2024 19:04:35 GMT Message-Id: <202404081904.438J4ZMs094557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 50a4c3bb7aec - stable/14 - riscv: Add missing includes for DDB 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 50a4c3bb7aec0f699ac0f2eebdb7f707c55e6419 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=50a4c3bb7aec0f699ac0f2eebdb7f707c55e6419 commit 50a4c3bb7aec0f699ac0f2eebdb7f707c55e6419 Author: John Baldwin AuthorDate: 2024-02-15 20:20:30 +0000 Commit: John Baldwin CommitDate: 2024-04-08 17:56:24 +0000 riscv: Add missing includes for DDB The #ifdef DDB code in parse_metadata was dead code without opt_ddb.h. While here, update the call to db_fetch_ksymtab for changes in commit 02bc014a200a. Reviewed by: mhorne Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D43919 (cherry picked from commit 962b0bcbd924d308016237abc991280f15777e7f) --- sys/riscv/riscv/machdep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index d5767e240c7e..5872ef9f94ac 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -33,6 +33,7 @@ * SUCH DAMAGE. */ +#include "opt_ddb.h" #include "opt_kstack_pages.h" #include "opt_platform.h" @@ -92,6 +93,10 @@ #include #include +#ifdef DDB +#include +#endif + #ifdef FDT #include #include @@ -456,7 +461,7 @@ parse_metadata(void) #ifdef DDB ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t); ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t); - db_fetch_ksymtab(ksym_start, ksym_end); + db_fetch_ksymtab(ksym_start, ksym_end, 0); #endif #ifdef FDT try_load_dtb(kmdp);