Author: andrew
Date: Tue Sep 13 16:31:20 2016
New Revision: 305774
URL: https://svnweb.freebsd.org/changeset/base/305774
Log:
Merge from stable/11 305773:
Fix the arm64 kernel build when DDB is disabled, debug_monitor.c
depends on DDB, and is unused when it's disabled.
Approved by: re (gjb)
Modified:
releng/11.0/sys/arm64/arm64/db_trace.c
releng/11.0/sys/arm64/arm64/debug_monitor.c
releng/11.0/sys/arm64/include/debug_monitor.h
releng/11.0/sys/conf/files.arm64
Directory Properties:
releng/11.0/ (props changed)
Modified: releng/11.0/sys/arm64/arm64/db_trace.c
==============================================================================
--- releng/11.0/sys/arm64/arm64/db_trace.c Tue Sep 13 16:22:50 2016
(r305773)
+++ releng/11.0/sys/arm64/arm64/db_trace.c Tue Sep 13 16:31:20 2016
(r305774)
@@ -27,6 +27,8 @@
* SUCH DAMAGE.
*/
+#include "opt_ddb.h"
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
Modified: releng/11.0/sys/arm64/arm64/debug_monitor.c
==============================================================================
--- releng/11.0/sys/arm64/arm64/debug_monitor.c Tue Sep 13 16:22:50 2016
(r305773)
+++ releng/11.0/sys/arm64/arm64/debug_monitor.c Tue Sep 13 16:31:20 2016
(r305774)
@@ -27,6 +27,8 @@
* SUCH DAMAGE.
*/
+#include "opt_ddb.h"
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
Modified: releng/11.0/sys/arm64/include/debug_monitor.h
==============================================================================
--- releng/11.0/sys/arm64/include/debug_monitor.h Tue Sep 13 16:22:50
2016 (r305773)
+++ releng/11.0/sys/arm64/include/debug_monitor.h Tue Sep 13 16:31:20
2016 (r305774)
@@ -32,7 +32,7 @@
#ifndef _MACHINE_DEBUG_MONITOR_H_
#define _MACHINE_DEBUG_MONITOR_H_
-#ifdef KDB
+#ifdef DDB
#include <machine/db_machdep.h>
Modified: releng/11.0/sys/conf/files.arm64
==============================================================================
--- releng/11.0/sys/conf/files.arm64 Tue Sep 13 16:22:50 2016
(r305773)
+++ releng/11.0/sys/conf/files.arm64 Tue Sep 13 16:31:20 2016
(r305774)
@@ -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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
