diff options
| author | andrew <andrew@FreeBSD.org> | 2016-09-13 16:22:50 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2016-09-13 16:22:50 +0000 |
| commit | 040460084cbb93610ffc8e24a0206f9b41189e73 (patch) | |
| tree | 2c17915b356a94247b28aa1e773455c43e91818f /sys | |
| parent | 9ebff16104b6a438f21c5cae6ead584e2867b490 (diff) | |
| download | FreeBSD-src-040460084cbb93610ffc8e24a0206f9b41189e73.zip FreeBSD-src-040460084cbb93610ffc8e24a0206f9b41189e73.tar.gz | |
MFC 305771, 305772:
Fix the arm64 kernel build when DDB is disabled, debug_monitor.c depends on
DDB, and is unused when it's disabled.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arm64/arm64/db_trace.c | 2 | ||||
| -rw-r--r-- | sys/arm64/arm64/debug_monitor.c | 2 | ||||
| -rw-r--r-- | sys/arm64/include/debug_monitor.h | 2 | ||||
| -rw-r--r-- | sys/conf/files.arm64 | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/sys/arm64/arm64/db_trace.c b/sys/arm64/arm64/db_trace.c index c606377..ee20e9f 100644 --- a/sys/arm64/arm64/db_trace.c +++ b/sys/arm64/arm64/db_trace.c @@ -27,6 +27,8 @@ * SUCH DAMAGE. */ +#include "opt_ddb.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/sys/arm64/arm64/debug_monitor.c b/sys/arm64/arm64/debug_monitor.c index 46167df..4d458fc 100644 --- a/sys/arm64/arm64/debug_monitor.c +++ b/sys/arm64/arm64/debug_monitor.c @@ -27,6 +27,8 @@ * SUCH DAMAGE. */ +#include "opt_ddb.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/sys/arm64/include/debug_monitor.h b/sys/arm64/include/debug_monitor.h index 59a0cb8..efe90da 100644 --- a/sys/arm64/include/debug_monitor.h +++ b/sys/arm64/include/debug_monitor.h @@ -32,7 +32,7 @@ #ifndef _MACHINE_DEBUG_MONITOR_H_ #define _MACHINE_DEBUG_MONITOR_H_ -#ifdef KDB +#ifdef DDB #include <machine/db_machdep.h> diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 22a8935..12ffa77 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -20,7 +20,7 @@ arm64/arm64/cpufunc_asm.S standard arm64/arm64/db_disasm.c optional ddb arm64/arm64/db_interface.c optional ddb arm64/arm64/db_trace.c optional ddb -arm64/arm64/debug_monitor.c optional kdb +arm64/arm64/debug_monitor.c optional ddb arm64/arm64/disassem.c optional ddb arm64/arm64/dump_machdep.c standard arm64/arm64/elf_machdep.c standard |
