Date: Tue, 13 Sep 2016 16:22:50 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r305773 - in stable/11/sys: arm64/arm64 arm64/include conf Message-ID: <201609131622.u8DGMoru046833@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Tue Sep 13 16:22:50 2016 New Revision: 305773 URL: https://svnweb.freebsd.org/changeset/base/305773 Log: 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. Modified: stable/11/sys/arm64/arm64/db_trace.c stable/11/sys/arm64/arm64/debug_monitor.c stable/11/sys/arm64/include/debug_monitor.h stable/11/sys/conf/files.arm64 Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm64/arm64/db_trace.c ============================================================================== --- stable/11/sys/arm64/arm64/db_trace.c Tue Sep 13 16:20:31 2016 (r305772) +++ stable/11/sys/arm64/arm64/db_trace.c Tue Sep 13 16:22:50 2016 (r305773) @@ -27,6 +27,8 @@ * SUCH DAMAGE. */ +#include "opt_ddb.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #include <sys/param.h> Modified: stable/11/sys/arm64/arm64/debug_monitor.c ============================================================================== --- stable/11/sys/arm64/arm64/debug_monitor.c Tue Sep 13 16:20:31 2016 (r305772) +++ stable/11/sys/arm64/arm64/debug_monitor.c Tue Sep 13 16:22:50 2016 (r305773) @@ -27,6 +27,8 @@ * SUCH DAMAGE. */ +#include "opt_ddb.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); Modified: stable/11/sys/arm64/include/debug_monitor.h ============================================================================== --- stable/11/sys/arm64/include/debug_monitor.h Tue Sep 13 16:20:31 2016 (r305772) +++ stable/11/sys/arm64/include/debug_monitor.h Tue Sep 13 16:22:50 2016 (r305773) @@ -32,7 +32,7 @@ #ifndef _MACHINE_DEBUG_MONITOR_H_ #define _MACHINE_DEBUG_MONITOR_H_ -#ifdef KDB +#ifdef DDB #include <machine/db_machdep.h> Modified: stable/11/sys/conf/files.arm64 ============================================================================== --- stable/11/sys/conf/files.arm64 Tue Sep 13 16:20:31 2016 (r305772) +++ stable/11/sys/conf/files.arm64 Tue Sep 13 16:22:50 2016 (r305773) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609131622.u8DGMoru046833>