git: 50a4c3bb7aec - stable/14 - riscv: Add missing includes for DDB
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 08 Apr 2024 19:04:35 UTC
The branch stable/14 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=50a4c3bb7aec0f699ac0f2eebdb7f707c55e6419
commit 50a4c3bb7aec0f699ac0f2eebdb7f707c55e6419
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-02-15 20:20:30 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
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 <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>
@@ -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);