From owner-svn-src-all@freebsd.org  Wed Apr  4 01:13:29 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E23F4F82A8D;
 Wed,  4 Apr 2018 01:13:28 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 94FF67F711;
 Wed,  4 Apr 2018 01:13:28 +0000 (UTC)
 (envelope-from gonzo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8FF404BEF;
 Wed,  4 Apr 2018 01:13:28 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w341DSqN062286;
 Wed, 4 Apr 2018 01:13:28 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w341DSZk062285;
 Wed, 4 Apr 2018 01:13:28 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201804040113.w341DSZk062285@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Wed, 4 Apr 2018 01:13:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r331967 - head/sys/arm64/arm64
X-SVN-Group: head
X-SVN-Commit-Author: gonzo
X-SVN-Commit-Paths: head/sys/arm64/arm64
X-SVN-Commit-Revision: 331967
X-SVN-Commit-Repository: base
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.25
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: Wed, 04 Apr 2018 01:13:29 -0000

Author: gonzo
Date: Wed Apr  4 01:13:28 2018
New Revision: 331967
URL: https://svnweb.freebsd.org/changeset/base/331967

Log:
  Fix arm64 buildkernel target with "nooptions KDB"
  
  Make kdb_trap in breakpoint exception handler conditional. If "options KDB"
  is not present just panic with message that debugger is not enabled.
  
  PR:		224653

Modified:
  head/sys/arm64/arm64/trap.c

Modified: head/sys/arm64/arm64/trap.c
==============================================================================
--- head/sys/arm64/arm64/trap.c	Tue Apr  3 23:49:35 2018	(r331966)
+++ head/sys/arm64/arm64/trap.c	Wed Apr  4 01:13:28 2018	(r331967)
@@ -323,8 +323,12 @@ do_el1h_sync(struct thread *td, struct trapframe *fram
 			break;
 		}
 #endif
+#ifdef KDB
 		kdb_trap(exception, 0,
 		    (td->td_frame != NULL) ? td->td_frame : frame);
+#else
+		panic("No debugger in kernel.\n");
+#endif
 		frame->tf_elr += 4;
 		break;
 	case EXCP_WATCHPT_EL1: