Tue Aug 15 09:08:39 2017 UTC ()
Rename intrddb -> intrddbipi, like i386.
(maxv)
diff -r1.26 -r1.27 src/sys/arch/amd64/amd64/db_interface.c
diff -r1.50 -r1.51 src/sys/arch/amd64/amd64/vector.S
diff -r1.61 -r1.62 src/sys/arch/x86/x86/lapic.c
--- src/sys/arch/amd64/amd64/db_interface.c 2017/08/15 06:57:53 1.26
+++ src/sys/arch/amd64/amd64/db_interface.c 2017/08/15 09:08:39 1.27
@@ -1,4 +1,4 @@
-/* $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
@@ -33,7 +33,7 @@
*/
#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"
@@ -95,7 +95,7 @@
int ddb_cpu = NOCPU;
typedef void (vector)(void);
-extern vector Xintrddb, Xx2apic_intrddb;
+extern vector Xintrddbipi, Xx2apic_intrddbipi;
void
db_machine_init(void)
@@ -103,10 +103,10 @@
#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,
--- src/sys/arch/amd64/amd64/vector.S 2017/07/16 14:02:48 1.50
+++ src/sys/arch/amd64/amd64/vector.S 2017/08/15 09:08:39 1.51
@@ -1,4 +1,4 @@
-/* $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.
@@ -155,7 +155,7 @@
IDTVEC_END(resume_lapic_ipi)
#if defined(DDB)
-IDTVEC(intrddb)
+IDTVEC(intrddbipi)
1:
pushq $0
pushq $T_BPTFLT
@@ -169,9 +169,9 @@
xorl %eax,%eax
movq %rax,%cr8
INTRFASTEXIT
-IDTVEC_END(intrddb)
+IDTVEC_END(intrddbipi)
-IDTVEC(x2apic_intrddb)
+IDTVEC(x2apic_intrddbipi)
1:
pushq $0
pushq $T_BPTFLT
@@ -187,7 +187,7 @@
xorl %eax,%eax
movq %rax,%cr8
INTRFASTEXIT
-IDTVEC_END(x2apic_intrddb)
+IDTVEC_END(x2apic_intrddbipi)
#endif /* DDB */
#endif /* MULTIPROCESSOR */
--- src/sys/arch/x86/x86/lapic.c 2017/08/11 06:18:29 1.61
+++ src/sys/arch/x86/x86/lapic.c 2017/08/15 09:08:39 1.62
@@ -1,4 +1,4 @@
-/* $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.
@@ -32,7 +32,7 @@
*/
#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"
@@ -80,7 +80,7 @@
#ifdef MULTIPROCESSOR
#ifdef __x86_64__
typedef void (vector)(void);
-extern vector Xx2apic_intrddb;
+extern vector Xx2apic_intrddbipi;
extern int ddb_vec;
#endif
#endif
@@ -333,8 +333,8 @@
#endif
#if defined(DDB) && defined(MULTIPROCESSOR)
#ifdef __x86_64__
- setgate(&idt[ddb_vec], &Xx2apic_intrddb, 1, SDT_SYS386IGT, SEL_KPL,
- GSEL(GCODE_SEL, SEL_KPL));
+ setgate(&idt[ddb_vec], &Xx2apic_intrddbipi, 1, SDT_SYS386IGT,
+ SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
#else
/* Set DDB IPI handler in cpu_set_tss_gates() when cpu0 is attached. */
#endif