From nobody Thu Feb 15 20:20:46 2024 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 4TbRJt2Dlgz5B6Sc; Thu, 15 Feb 2024 20:20:46 +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 4TbRJt1l2Mz47X8; Thu, 15 Feb 2024 20:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028446; 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=QRvBv3uLQlTGVW8M3/JVWpzuJagH/Pgy19Khi6vKTpo=; b=M2P9CkpOTrVkY7NY31UK8D3rZnFfgq/itAbDh3UQLxqKSimXvv8c2fgcVBsbA5RAHvgi+O 84Nm1CqnnjOy8wtr5sHUHqIKD5SDbP9BihX97HiC+gFQc8lzNEGtTuOfn/is0Z59b/Yw9i jYruRBcnGvKrmmZmeFHnfz2wf9/zA4MUBF74getW7l99RT1oYxB0Npc9/6Vs9dPCeDsAXt kFovtY4pJ4v905lxYJGKlpqEjFIGaOGumOcWv9g+ECdpGoY7vgn/cJQYYDkSdoCnbQvH1v gnT5WE2zcTTuI9aiWyrnTV7el/yov9qotRWPtoaKlK2nA0E3k8L4F4/KYP2F+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028446; 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=QRvBv3uLQlTGVW8M3/JVWpzuJagH/Pgy19Khi6vKTpo=; b=Bi7521P/ggcD77RLIHey+MWB0hTxqFvdr8DHdlzesTrkhJsaTHPHPPmHF58WW2goqtGLrY HexCWnytTNFNcJOGA2znpj0Wk3IiKre5pHZP8WGVcAP222BmrbIotzG+ASS6AVzS4rJghF K9wrsHzb6hft94CCYfDcODRj/LzLflXYf4zMn9bQD8jfCTpcClyYp8GVcKzyqaQLMlIt8J kCPlymBQdWINRkk1UC7yRUye01wQDHcFFuZibluybICfICMptYZempIamTa3JhH8iSjYPF NGQgjYxrE08h+Cy9UruWu4kmLG0f3+YOmclr3gs2jYuG/3ZpBYl6iG5OxHes6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708028446; a=rsa-sha256; cv=none; b=UHU5Go7Ktbz4d7iqS8WYgnjqttxDKeHApWPIEMKGwYCUoWEfTk59/IaQFUPYyYcU/I/kw6 zqD5DPYyzmLLz64RmAR8Ao7ft38CPYS4ETWva6loYystN3RrE2rynnW74fWQ3ngbEdsbIj 2xWK/AVvvpXKTUmX7SSTtxL4GLZrMyfG+VKh/vmz3zh7sAvnVAMoTMCwBLVAfSAJ8Ue25+ Jj5iaC9vVNWOe4A7NA+DhFTpq6aegJDQDb78FxnuBrXM6/VTSIrDQjCw0d3GsnblK4IHCj uT5rSNGhE5EPwy/fSJMoj87HsR9iiHU52LFssJJKhzh7PIRTBe5aQLjzUnC3hg== 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 4TbRJt0r3Zzw7m; Thu, 15 Feb 2024 20:20: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 41FKKk1d046698; Thu, 15 Feb 2024 20:20:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FKKk28046695; Thu, 15 Feb 2024 20:20:46 GMT (envelope-from git) Date: Thu, 15 Feb 2024 20:20:46 GMT Message-Id: <202402152020.41FKKk28046695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 962b0bcbd924 - main - riscv: Add missing includes for DDB 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 962b0bcbd924d308016237abc991280f15777e7f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=962b0bcbd924d308016237abc991280f15777e7f commit 962b0bcbd924d308016237abc991280f15777e7f Author: John Baldwin AuthorDate: 2024-02-15 20:20:30 +0000 Commit: John Baldwin CommitDate: 2024-02-15 20:20:30 +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 --- 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 a0ed59cfef87..4e3564b11c9e 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" @@ -91,6 +92,10 @@ #include #include +#ifdef DDB +#include +#endif + #ifdef FDT #include #include @@ -455,7 +460,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);