From owner-svn-src-head@freebsd.org  Fri Oct 28 12:27:06 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 C29CFC21BFF;
 Fri, 28 Oct 2016 12:27:06 +0000 (UTC) (envelope-from kib@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 8BE826B2;
 Fri, 28 Oct 2016 12:27:06 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9SCR5Fu024132;
 Fri, 28 Oct 2016 12:27:05 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9SCR5d8024131;
 Fri, 28 Oct 2016 12:27:05 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201610281227.u9SCR5d8024131@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 28 Oct 2016 12:27:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308030 - head/sys/x86/x86
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Oct 2016 12:27:06 -0000

Author: kib
Date: Fri Oct 28 12:27:05 2016
New Revision: 308030
URL: https://svnweb.freebsd.org/changeset/base/308030

Log:
  Use correct cpu id in the banner.  Fix style.
  
  Noted by:	avg
  Sponsored by:	The FreeBSD Foundation
  MFC after:	9 days

Modified:
  head/sys/x86/x86/cpu_machdep.c

Modified: head/sys/x86/x86/cpu_machdep.c
==============================================================================
--- head/sys/x86/x86/cpu_machdep.c	Fri Oct 28 11:53:22 2016	(r308029)
+++ head/sys/x86/x86/cpu_machdep.c	Fri Oct 28 12:27:05 2016	(r308030)
@@ -551,7 +551,7 @@ nmi_call_kdb(u_int cpu, u_int type, stru
 		 * NMI can be hooked up to a pushbutton for debugging.
 		 */
 		if (kdb_on_nmi) {
-			printf ("NMI/cpu%d ... going to debugger\n", cpu);
+			printf("NMI/cpu%d ... going to debugger\n", cpu);
 			kdb_trap(type, 0, frame);
 		}
 #endif /* KDB */
@@ -572,6 +572,6 @@ nmi_handle_intr(u_int type, struct trapf
 		return;
 	}
 #endif
-	nmi_call_kdb(0, type, frame);
+	nmi_call_kdb(PCPU_GET(cpuid), type, frame);
 #endif
 }