 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_interface.c,v 1.26 2017/08/15 06:57:53 maxv Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.27 2017/08/15 09:08:39 maxv Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -23,27 +23,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
+ *
  *	db_interface.c,v 2.4 1991/02/05 17:11:13 mrt (CMU)
  */
 /*
  * Interface to new debugger.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.26 2017/08/15 06:57:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.27 2017/08/15 09:08:39 maxv Exp $");
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include "lapic.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 @@ -85,38 +85,38 @@ void kdbprinttrap(int, int);
 extern void ddb_ipi(struct trapframe);
 static void ddb_suspend(struct trapframe *);
 #ifndef XEN
 int ddb_vec;
 #endif /* XEN */
 static bool ddb_mp_online;
 #endif
 #define NOCPU	-1
 int ddb_cpu = NOCPU;
 typedef void (vector)(void);
-extern vector Xintrddb, Xx2apic_intrddb;
+extern vector Xintrddbipi, Xx2apic_intrddbipi;
 void
 db_machine_init(void)
+{
 #ifdef MULTIPROCESSOR
 #ifndef XEN
-	vector *handler = &Xintrddb;
+	vector *handler = &Xintrddbipi;
 #if NLAPIC > 0
 	if (lapic_is_x2apic())
-		handler = &Xx2apic_intrddb;
+		handler = &Xx2apic_intrddbipi;
 #endif
 	ddb_vec = idt_vec_alloc(0xf0, 0xff);
 	setgate(&idt[ddb_vec], handler, 1, SDT_SYS386IGT, SEL_KPL,
 	    GSEL(GCODE_SEL, SEL_KPL));
 #else
 	/* Initialised as part of xen_ipi_init() */
 #endif /* XEN */
 #endif
+}
 #ifdef MULTIPROCESSOR
 __cpu_simple_lock_t db_lock;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vector.S,v 1.50 2017/07/16 14:02:48 cherry Exp $	*/
+/*	$NetBSD: vector.S,v 1.51 2017/08/15 09:08:39 maxv Exp $	*/
 /*-
  * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -145,59 +145,59 @@ IDTVEC(resume_lapic_ipi)
 :
 	incl	CPUVAR(IDEPTH)
 	movl	$IPL_HIGH,CPUVAR(ILEVEL)
 	sti
 	pushq	%rbx
 	call	_C_LABEL(x86_ipi_handler)
 	jmp	_C_LABEL(Xdoreti)
 :
 	orl	$(1 << LIR_IPI),CPUVAR(IPENDING)
 	INTRFASTEXIT
 IDTVEC_END(resume_lapic_ipi)
 #if defined(DDB)
-IDTVEC(intrddb)
+IDTVEC(intrddbipi)
 :
 	pushq	$0
 	pushq	$T_BPTFLT
 	INTRENTRY
 	movl	$0xf,%eax
 	movq	%rax,%cr8
 	movq	_C_LABEL(local_apic_va),%rbx
 	movl	$0,LAPIC_EOI(%rbx)
 	sti
 	call	_C_LABEL(ddb_ipi)
 	xorl	%eax,%eax
 	movq	%rax,%cr8
 	INTRFASTEXIT
-IDTVEC_END(intrddb)
+IDTVEC_END(intrddbipi)
-IDTVEC(x2apic_intrddb)
+IDTVEC(x2apic_intrddbipi)
 :
 	pushq	$0
 	pushq	$T_BPTFLT
 	INTRENTRY
 	movl	$0xf,%eax
 	movq	%rax,%cr8
 	movl	$(MSR_X2APIC_BASE + MSR_X2APIC_EOI),%ecx
 	xorl	%eax,%eax
 	xorl	%edx,%edx
 	wrmsr
 	sti
 	call	_C_LABEL(ddb_ipi)
 	xorl	%eax,%eax
 	movq	%rax,%cr8
 	INTRFASTEXIT
-IDTVEC_END(x2apic_intrddb)
+IDTVEC_END(x2apic_intrddbipi)
 #endif /* DDB */
 #endif /* MULTIPROCESSOR */
 	/*
 	 * Interrupt from the local APIC timer.
 	 */
 IDTVEC(recurse_lapic_ltimer)
 	INTR_RECURSE_HWFRAME
 	pushq	$0
 	pushq	$T_ASTFLT
 	INTRENTRY
 	jmp	1f
 IDTVEC_END(recurse_lapic_ltimer)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lapic.c,v 1.61 2017/08/11 06:18:29 maxv Exp $	*/
+/*	$NetBSD: lapic.c,v 1.62 2017/08/15 09:08:39 maxv Exp $	*/
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.61 2017/08/11 06:18:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.62 2017/08/15 09:08:39 maxv Exp $");
 #include "acpica.h"
 #include "ioapic.h"
 #include "opt_acpi.h"
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_multiprocessor.h"
 #include "opt_ntp.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 @@ -70,27 +70,27 @@ __KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.
 #include <machine/i82489reg.h>
 #include <machine/i82489var.h>
 #if NACPICA > 0
 #include <dev/acpi/acpica.h>
 #include <dev/acpi/acpivar.h>
 #endif
 #ifdef DDB
 #include <machine/db_machdep.h>
 #ifdef MULTIPROCESSOR
 #ifdef __x86_64__
 typedef void (vector)(void);
-extern vector Xx2apic_intrddb;
+extern vector Xx2apic_intrddbipi;
 extern int ddb_vec;
 #endif
 #endif
 #endif
 #include <x86/x86/vmtreg.h>	/* for vmt_hvcall() */
 #include <x86/x86/vmtvar.h>	/* for vmt_hvcall() */
 /* Referenced from vector.S */
 void		lapic_clockintr(void *, struct intrframe *);
 static void	lapic_delay(unsigned int);
 static uint32_t lapic_gettick(void);
 @@ -323,28 +323,28 @@ lapic_setup_bsp(paddr_t lapic_base)
+		}
+	}
 	if (x2apic_mode) {
 		x86_ipi = x2apic_ipi;
 #if NIOAPIC > 0
 		struct ioapic_softc *ioapic;
 		for (ioapic = ioapics; ioapic != NULL; ioapic = ioapic->sc_next) {
 			ioapic->sc_pic.pic_edge_stubs = x2apic_edge_stubs;
 			ioapic->sc_pic.pic_level_stubs = x2apic_level_stubs;
+		}
 #endif
 #if defined(DDB) && defined(MULTIPROCESSOR)
 #ifdef __x86_64__
-		setgate(&idt[ddb_vec], &Xx2apic_intrddb, 1, SDT_SYS386IGT, SEL_KPL,
+		setgate(&idt[ddb_vec], &Xx2apic_intrddbipi, 1, SDT_SYS386IGT,
-		    GSEL(GCODE_SEL, SEL_KPL));
+		    SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
 #else
 		/* Set DDB IPI handler in cpu_set_tss_gates() when cpu0 is attached. */
 #endif
 #endif
 		x86_disable_intr();
 		lapic_enable_x2apic();
 #ifdef MULTIPROCESSOR
 		cpu_init_first();	/* catch up to changed cpu_number() */
 #endif
 		lapic_write_tpri(0);
 		x86_enable_intr();
 	} else