lkml.org 
[lkml]   [2005]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[patch 07/16] x86_64: Rename KDB_VECTOR to DEBUGGER_VECTOR
    Date
    From

    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;
    }
    _
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-08-29 18:15    [W:3.562 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site