Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Feb 2024 20:20:46 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 962b0bcbd924 - main - riscv: Add missing includes for DDB
Message-ID:  <202402152020.41FKKk28046695@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=962b0bcbd924d308016237abc991280f15777e7f

commit 962b0bcbd924d308016237abc991280f15777e7f
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-02-15 20:20:30 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
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 <machine/trap.h>
 #include <machine/vmparam.h>
 
+#ifdef DDB
+#include <ddb/ddb.h>
+#endif
+
 #ifdef FDT
 #include <contrib/libfdt/libfdt.h>
 #include <dev/fdt/fdt_common.h>
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402152020.41FKKk28046695>