lkml.org 
[lkml]   [2009]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/13] x86: unify apic_intr_init() in irqinit_{32,64}.c
    Date
    Impact: cleanup

    Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
    ---
    arch/x86/kernel/irqinit_32.c | 9 ++++++++-
    arch/x86/kernel/irqinit_64.c | 11 +++++++++++
    2 files changed, 19 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c
    index 72ce942..f3be5e9 100644
    --- a/arch/x86/kernel/irqinit_32.c
    +++ b/arch/x86/kernel/irqinit_32.c
    @@ -180,7 +180,12 @@ static void __init apic_intr_init(void)
    {
    smp_intr_init();

    -#ifdef CONFIG_X86_LOCAL_APIC
    +#ifdef CONFIG_X86_64
    + alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);
    + alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt);
    +#endif
    +
    +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)
    /* self generated IPI for local APIC timer */
    alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);

    @@ -192,10 +197,12 @@ static void __init apic_intr_init(void)
    alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);
    #endif

    +#ifdef CONFIG_X86_32
    #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_MCE_P4THERMAL)
    /* thermal monitor LVT interrupt */
    alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);
    #endif
    +#endif
    }

    #ifdef CONFIG_X86_32
    diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c
    index 687b6c3..f3be5e9 100644
    --- a/arch/x86/kernel/irqinit_64.c
    +++ b/arch/x86/kernel/irqinit_64.c
    @@ -180,9 +180,12 @@ static void __init apic_intr_init(void)
    {
    smp_intr_init();

    +#ifdef CONFIG_X86_64
    alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);
    alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt);
    +#endif

    +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)
    /* self generated IPI for local APIC timer */
    alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);

    @@ -192,6 +195,14 @@ static void __init apic_intr_init(void)
    /* IPI vectors for APIC spurious and error interrupts */
    alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);
    alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);
    +#endif
    +
    +#ifdef CONFIG_X86_32
    +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_MCE_P4THERMAL)
    + /* thermal monitor LVT interrupt */
    + alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt);
    +#endif
    +#endif
    }

    #ifdef CONFIG_X86_32
    --
    1.5.6.3


    \
     
     \ /
      Last update: 2009-04-07 20:57    [W:0.030 / U:60.512 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site