Module Name: src Committed By: maxv Date: Tue Aug 15 09:08:39 UTC 2017
Modified Files: src/sys/arch/amd64/amd64: db_interface.c vector.S src/sys/arch/x86/x86: lapic.c Log Message: Rename intrddb -> intrddbipi, like i386. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amd64/amd64/db_interface.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/amd64/vector.S cvs rdiff -u -r1.61 -r1.62 src/sys/arch/x86/x86/lapic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/amd64/amd64/db_interface.c diff -u src/sys/arch/amd64/amd64/db_interface.c:1.26 src/sys/arch/amd64/amd64/db_interface.c:1.27 --- src/sys/arch/amd64/amd64/db_interface.c:1.26 Tue Aug 15 06:57:53 2017 +++ src/sys/arch/amd64/amd64/db_interface.c Tue Aug 15 09:08:39 2017 @@ -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 @@ static bool ddb_mp_online; 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 @@ 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, Index: src/sys/arch/amd64/amd64/vector.S diff -u src/sys/arch/amd64/amd64/vector.S:1.50 src/sys/arch/amd64/amd64/vector.S:1.51 --- src/sys/arch/amd64/amd64/vector.S:1.50 Sun Jul 16 14:02:48 2017 +++ src/sys/arch/amd64/amd64/vector.S Tue Aug 15 09:08:39 2017 @@ -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(resume_lapic_ipi) IDTVEC_END(resume_lapic_ipi) #if defined(DDB) -IDTVEC(intrddb) +IDTVEC(intrddbipi) 1: pushq $0 pushq $T_BPTFLT @@ -169,9 +169,9 @@ IDTVEC(intrddb) 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 @@ IDTVEC(x2apic_intrddb) xorl %eax,%eax movq %rax,%cr8 INTRFASTEXIT -IDTVEC_END(x2apic_intrddb) +IDTVEC_END(x2apic_intrddbipi) #endif /* DDB */ #endif /* MULTIPROCESSOR */ Index: src/sys/arch/x86/x86/lapic.c diff -u src/sys/arch/x86/x86/lapic.c:1.61 src/sys/arch/x86/x86/lapic.c:1.62 --- src/sys/arch/x86/x86/lapic.c:1.61 Fri Aug 11 06:18:29 2017 +++ src/sys/arch/x86/x86/lapic.c Tue Aug 15 09:08:39 2017 @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1. #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 @@ lapic_setup_bsp(paddr_t lapic_base) #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