From owner-svn-src-all@freebsd.org  Tue Sep 13 15:45:24 2016
Return-Path: <owner-svn-src-all@freebsd.org>
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 3C8BCBD9B51;
 Tue, 13 Sep 2016 15:45:24 +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 0F2E0C24;
 Tue, 13 Sep 2016 15:45:23 +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 u8DFjNOr031132;
 Tue, 13 Sep 2016 15:45:23 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DFjNmr031130;
 Tue, 13 Sep 2016 15:45:23 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201609131545.u8DFjNmr031130@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 13 Sep 2016 15:45:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r305771 - in head/sys: arm64/include conf
X-SVN-Group: head
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Sep 2016 15:45:24 -0000

Author: andrew
Date: Tue Sep 13 15:45:22 2016
New Revision: 305771
URL: https://svnweb.freebsd.org/changeset/base/305771

Log:
  Fix the arm64 kernel build when DDB is disabled, debug_monitor.c depends on
  DDB, and is unused when it's disabled.
  
  Obtained from:	ABT Systems Ltd
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/arm64/include/debug_monitor.h
  head/sys/conf/files.arm64

Modified: head/sys/arm64/include/debug_monitor.h
==============================================================================
--- head/sys/arm64/include/debug_monitor.h	Tue Sep 13 15:41:05 2016	(r305770)
+++ head/sys/arm64/include/debug_monitor.h	Tue Sep 13 15:45:22 2016	(r305771)
@@ -32,7 +32,7 @@
 #ifndef _MACHINE_DEBUG_MONITOR_H_
 #define	_MACHINE_DEBUG_MONITOR_H_
 
-#ifdef KDB
+#ifdef DDB
 
 #include <machine/db_machdep.h>
 

Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64	Tue Sep 13 15:41:05 2016	(r305770)
+++ head/sys/conf/files.arm64	Tue Sep 13 15:45:22 2016	(r305771)
@@ -62,7 +62,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