From owner-freebsd-current@freebsd.org  Mon Oct 24 18:58:45 2016
Return-Path: <owner-freebsd-current@freebsd.org>
Delivered-To: freebsd-current@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 A15E2C1FD19
 for <freebsd-current@mailman.ysv.freebsd.org>;
 Mon, 24 Oct 2016 18:58:45 +0000 (UTC)
 (envelope-from imb@protected-networks.net)
Received: from mail.protected-networks.net (mail.protected-networks.net
 [IPv6:2001:470:8d59:1::8])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mail.protected-networks.net",
 Issuer "Protected Networks CA" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 7314123B;
 Mon, 24 Oct 2016 18:58:45 +0000 (UTC)
 (envelope-from imb@protected-networks.net)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=
 protected-networks.net; h=content-transfer-encoding:content-type
 :content-type:mime-version:user-agent:date:date:message-id
 :subject:subject:from:from; s=201508; t=1477335523; bh=7leVxVI1v
 4T2hokQPoUAcRNomZkvm8tuPRtMvF3S3/s=; b=AwKgw7HvXwR/AUu3wyk4hMRiR
 GlBgCXQzwFROfcQQJTOwtx32FhosHbvZpA6yHky8aJrt6EBlHzKJkWTYNlykXPxf
 25iHiVA3drY3Kzdx5xX42dhAtf8ZBs9jfp+gJrDFqLEPM6zJM21DHBpdOlRhpncG
 tia7W7FEkP4vyTJCAA=
Received: from toshi.auburn.protected-networks.net
 (gw.auburn.protected-networks.net [192.168.1.1])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client did not present a certificate)
 (Authenticated sender: imb@mail.protected-networks.net)
 by mail.protected-networks.net (Postfix) with ESMTPSA id B479F211DA;
 Mon, 24 Oct 2016 14:58:43 -0400 (EDT)
To: freebsd-current <freebsd-current@freebsd.org>
Cc: kib@freebsd.org
From: Michael Butler <imb@protected-networks.net>
Subject: SVN r307866 compilation problem
Message-ID: <f9d8f518-6563-99f8-e427-11830ffb3f84@protected-networks.net>
Date: Mon, 24 Oct 2016 14:58:43 -0400
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101
 Thunderbird/45.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Oct 2016 18:58:45 -0000

It seems that compilation of -current fails in the case that KDB is not 
defined.

I'm assuming that the following diff achieves what was intended:

imb@vm01:/usr/src/sys/x86/x86> svn diff
Index: cpu_machdep.c
===================================================================
--- cpu_machdep.c       (revision 307875)
+++ cpu_machdep.c       (working copy)
@@ -540,9 +540,9 @@
  nmi_call_kdb(u_int cpu, u_int type, struct trapframe *frame, bool 
do_panic)
  {

+#ifdef KDB
         /* machine/parity/power fail/"kitchen sink" faults */
         if (isa_nmi(frame->tf_err) == 0) {
-#ifdef KDB
                 /*
                  * NMI can be hooked up to a pushbutton for debugging.
                  */