From owner-svn-src-all@freebsd.org Tue Sep 13 16:22:51 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8569BD991C; Tue, 13 Sep 2016 16:22:51 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 98218F6E; Tue, 13 Sep 2016 16:22:51 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8DGMoLl046837; Tue, 13 Sep 2016 16:22:50 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DGMoru046833; Tue, 13 Sep 2016 16:22:50 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201609131622.u8DGMoru046833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 13 Sep 2016 16:22:50 +0000 (UTC) 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 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2016 16:22:52 -0000 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 __FBSDID("$FreeBSD$"); #include 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 __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 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