From owner-freebsd-current@freebsd.org  Mon Oct 24 20:53:38 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 82696C1FB68
 for <freebsd-current@mailman.ysv.freebsd.org>;
 Mon, 24 Oct 2016 20:53:38 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 04BF7E77
 for <freebsd-current@freebsd.org>; Mon, 24 Oct 2016 20:53:37 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id u9OKrWlA044868
 (version=TLSv1 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO);
 Mon, 24 Oct 2016 23:53:32 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua u9OKrWlA044868
Received: (from kostik@localhost)
 by tom.home (8.15.2/8.15.2/Submit) id u9OKrUTU044867;
 Mon, 24 Oct 2016 23:53:30 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Mon, 24 Oct 2016 23:53:30 +0300
From: Konstantin Belousov <kostikbel@gmail.com>
To: Michael Butler <imb@protected-networks.net>
Cc: freebsd-current <freebsd-current@freebsd.org>
Subject: Re: SVN r307866 compilation problem
Message-ID: <20161024205330.GD54029@kib.kiev.ua>
References: <f9d8f518-6563-99f8-e427-11830ffb3f84@protected-networks.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <f9d8f518-6563-99f8-e427-11830ffb3f84@protected-networks.net>
User-Agent: Mutt/1.7.1 (2016-10-04)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 autolearn_force=no version=3.4.1
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home
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 20:53:38 -0000

On Mon, Oct 24, 2016 at 02:58:43PM -0400, Michael Butler wrote:
> 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.
>                   */
Um, no.  isa_nmi() should be checked and panic avoided regardless
of the panic_on_nmi setting, if no hw error was reported.  It is
#endif that was misplaced.

This and another change, are committed as r307880.

Thank you for the report.