public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Tom Rini <trini@kernel.crashing.org>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, trini@kernel.crashing.org,
	ak@suse.de, kaos@sgi.com
Subject: [patch 07/16] x86_64: Rename KDB_VECTOR to DEBUGGER_VECTOR
Date: Mon, 29 Aug 2005 09:10:18 -0700	[thread overview]
Message-ID: <resend.7.2982005.trini@kernel.crashing.org> (raw)
In-Reply-To: <resend.6.2982005.trini@kernel.crashing.org>


CC: Andi Kleen <ak@suse.de>, Keith Owens <kaos@sgi.com>
The existing hook from KDB in the IPI code is really just a hook for the
NMI vector.  We rename the vector thusly and then it's up to the
debugger to handle things from do_default_nmi().

---

 linux-2.6.13-trini/arch/x86_64/kernel/i8259.c  |    3 +--
 linux-2.6.13-trini/arch/x86_64/kernel/smp.c    |    2 +-
 linux-2.6.13-trini/arch/x86_64/kernel/traps.c  |    2 +-
 linux-2.6.13-trini/include/asm-x86_64/hw_irq.h |    2 +-
 linux-2.6.13-trini/include/asm-x86_64/ipi.h    |    2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff -puN arch/x86_64/kernel/i8259.c~x86_64-rename_kdb_vector arch/x86_64/kernel/i8259.c
--- linux-2.6.13/arch/x86_64/kernel/i8259.c~x86_64-rename_kdb_vector	2005-08-10 10:54:58.000000000 -0700
+++ linux-2.6.13-trini/arch/x86_64/kernel/i8259.c	2005-08-10 10:54:58.000000000 -0700
@@ -544,10 +544,9 @@ void __init init_IRQ(void)
 		int vector = FIRST_EXTERNAL_VECTOR + i;
 		if (i >= NR_IRQS)
 			break;
-		if (vector != IA32_SYSCALL_VECTOR && vector != KDB_VECTOR) { 
+		if (vector != IA32_SYSCALL_VECTOR && vector != NMI_VECTOR)
 			set_intr_gate(vector, interrupt[i]);
 	}
-	}
 
 #ifdef CONFIG_SMP
 	/*
diff -puN arch/x86_64/kernel/smp.c~x86_64-rename_kdb_vector arch/x86_64/kernel/smp.c
--- linux-2.6.13/arch/x86_64/kernel/smp.c~x86_64-rename_kdb_vector	2005-08-10 10:54:58.000000000 -0700
+++ linux-2.6.13-trini/arch/x86_64/kernel/smp.c	2005-08-10 10:54:58.000000000 -0700
@@ -252,7 +252,7 @@ void flush_tlb_all(void)
 
 void smp_kdb_stop(void)
 {
-	send_IPI_allbutself(KDB_VECTOR);
+	send_IPI_allbutself(NMI_VECTOR);
 }
 
 /*
diff -puN arch/x86_64/kernel/traps.c~x86_64-rename_kdb_vector arch/x86_64/kernel/traps.c
--- linux-2.6.13/arch/x86_64/kernel/traps.c~x86_64-rename_kdb_vector	2005-08-10 10:54:58.000000000 -0700
+++ linux-2.6.13-trini/arch/x86_64/kernel/traps.c	2005-08-10 10:54:58.000000000 -0700
@@ -931,7 +931,7 @@ void __init trap_init(void)
 	set_system_gate(IA32_SYSCALL_VECTOR, ia32_syscall);
 #endif
        
-	set_intr_gate(KDB_VECTOR, call_debug);
+	set_intr_gate(NMI_VECTOR, call_debug);
        
 	/*
 	 * Should be a barrier for any external CPU state.
diff -puN include/asm-x86_64/hw_irq.h~x86_64-rename_kdb_vector include/asm-x86_64/hw_irq.h
--- linux-2.6.13/include/asm-x86_64/hw_irq.h~x86_64-rename_kdb_vector	2005-08-10 10:54:58.000000000 -0700
+++ linux-2.6.13-trini/include/asm-x86_64/hw_irq.h	2005-08-10 10:54:58.000000000 -0700
@@ -54,7 +54,7 @@ struct hw_interrupt_type;
 #define RESCHEDULE_VECTOR	0xfc
 #define TASK_MIGRATION_VECTOR	0xfb
 #define CALL_FUNCTION_VECTOR	0xfa
-#define KDB_VECTOR	0xf9
+#define NMI_VECTOR	0xf9
 
 #define THERMAL_APIC_VECTOR	0xf0
 
diff -puN include/asm-x86_64/ipi.h~x86_64-rename_kdb_vector include/asm-x86_64/ipi.h
--- linux-2.6.13/include/asm-x86_64/ipi.h~x86_64-rename_kdb_vector	2005-08-10 10:54:58.000000000 -0700
+++ linux-2.6.13-trini/include/asm-x86_64/ipi.h	2005-08-10 10:54:58.000000000 -0700
@@ -32,7 +32,7 @@
 static inline unsigned int __prepare_ICR (unsigned int shortcut, int vector, unsigned int dest)
 {
 	unsigned int icr =  APIC_DM_FIXED | shortcut | vector | dest;
-	if (vector == KDB_VECTOR)
+	if (vector == NMI_VECTOR)
 		icr = (icr & (~APIC_VECTOR_MASK)) | APIC_DM_NMI;
 	return icr;
 }
_

  reply	other threads:[~2005-08-29 16:10 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1.2982005.trini@kernel.crashing.org>
2005-08-29 16:08 ` [patch 01/16] Add a KGDB core Tom Rini
2005-08-29 16:09   ` [patch 02/16] Add support for i386 platforms to KGDB Tom Rini
2005-08-29 16:09     ` [patch 03/16] Add support for PowerPC32 " Tom Rini
2005-08-29 16:09       ` [patch 04/16] I/O driver for 8250-compatible UARTs Tom Rini
2005-08-29 16:09         ` [patch 05/16] Add support for MIPS platforms to KGDB Tom Rini
2005-08-29 16:10           ` [patch 06/16] Add support for IA64 " Tom Rini
2005-08-29 16:10             ` Tom Rini [this message]
2005-08-29 16:10               ` [patch 08/16] Add support for X86_64 " Tom Rini
2005-08-29 16:10                 ` [patch 09/16] Add support for SuperH " Tom Rini
2005-08-29 16:10                   ` [patch 10/16] Add support for ARM " Tom Rini
2005-08-29 16:11                     ` [patch 11/16] Add support for PowerPC64 " Tom Rini
2005-08-29 16:11                       ` [patch 12/16] KGDBoE I/O driver Tom Rini
2005-08-29 16:11                         ` [patch 13/16] Add CFI DWARF2 annotation support Tom Rini
2005-08-29 16:11                           ` [patch 14/16] Minor SysRq keyboard bugfix for KGDB Tom Rini
2005-08-29 16:11                             ` [patch 15/16] Allow KGDB to work well with loaded modules Tom Rini
2005-08-29 16:12                               ` [patch 16/16] Add hardware breakpoint support for i386 Tom Rini
2005-08-29 21:23                                 ` Andi Kleen
2005-08-31 14:39                                   ` Tom Rini
2005-08-30  1:06                                 ` Keith Owens
2005-08-29 17:13                 ` [patch 08/16] Add support for X86_64 platforms to KGDB Andi Kleen
2005-08-29 17:45                   ` Tom Rini
2005-08-29 18:46                     ` Andi Kleen
2005-08-29 18:49                       ` Tom Rini
2005-08-29 16:18         ` [patch 04/16] I/O driver for 8250-compatible UARTs Russell King
2005-08-29 16:28           ` Tom Rini
2005-08-31 19:38         ` Bjorn Helgaas
2005-08-31 20:10           ` Tom Rini
2005-08-31 21:03             ` Russell King
2005-08-31 21:23               ` Tom Rini
2005-08-31 21:19             ` Bjorn Helgaas
2005-08-31 22:15               ` Tom Rini
2005-08-29 19:55     ` [patch 2/3] x86_64: Run setup_per_cpu_areas and trap_init sooner Andi Kleen
2005-08-29 20:03       ` Tom Rini
2005-08-30  7:33   ` [patch 1/3] x86_64: Add a notify_die() call to the "no context" part of do_page_fault() George Anzinger
2005-08-30 14:06     ` Tom Rini
2005-08-30 14:50       ` George Anzinger
2005-08-30 19:53         ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=resend.7.2982005.trini@kernel.crashing.org \
    --to=trini@kernel.crashing.org \
    --cc=ak@suse.de \
    --cc=akpm@osdl.org \
    --cc=kaos@sgi.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox