lkml.org 
[lkml]   [2010]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] x86: remove left over nr_legacy_irqs


    already in legacy_pic

    Singed-off-by: Yinghai Lu <yinghai@kernel.org>

    ---
    arch/x86/include/asm/irq.h | 1 -
    arch/x86/kernel/irqinit.c | 7 ++-----
    2 files changed, 2 insertions(+), 6 deletions(-)

    Index: linux-2.6/arch/x86/include/asm/irq.h
    ===================================================================
    --- linux-2.6.orig/arch/x86/include/asm/irq.h
    +++ linux-2.6/arch/x86/include/asm/irq.h
    @@ -48,6 +48,5 @@ extern DECLARE_BITMAP(used_vectors, NR_V
    extern int vector_used_by_percpu_irq(unsigned int vector);

    extern void init_ISA_irqs(void);
    -extern int nr_legacy_irqs;

    #endif /* _ASM_X86_IRQ_H */
    Index: linux-2.6/arch/x86/kernel/irqinit.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/irqinit.c
    +++ linux-2.6/arch/x86/kernel/irqinit.c
    @@ -99,9 +99,6 @@ int vector_used_by_percpu_irq(unsigned i
    return 0;
    }

    -/* Number of legacy interrupts */
    -int nr_legacy_irqs __read_mostly = NR_IRQS_LEGACY;
    -
    void __init init_ISA_irqs(void)
    {
    int i;
    @@ -114,7 +111,7 @@ void __init init_ISA_irqs(void)
    /*
    * 16 old-style INTA-cycle interrupts:
    */
    - for (i = 0; i < NR_IRQS_LEGACY; i++) {
    + for (i = 0; i < legacy_pic->nr_legacy_irqs; i++) {
    struct irq_desc *desc = irq_to_desc(i);

    desc->status = IRQ_DISABLED;
    @@ -138,7 +135,7 @@ void __init init_IRQ(void)
    * then this vector space can be freed and re-used dynamically as the
    * irq's migrate etc.
    */
    - for (i = 0; i < nr_legacy_irqs; i++)
    + for (i = 0; i < legacy_pic->nr_legacy_irqs; i++)
    per_cpu(vector_irq, 0)[IRQ0_VECTOR + i] = i;

    x86_init.irqs.intr_init();

    \
     
     \ /
      Last update: 2010-02-24 05:21    [W:0.022 / U:0.180 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site