x86, legacy_irq: Remove left over nr_legacy_irqs

nr_legacy_irqs and its ilk have moved to legacy_pic.

-v2: there is one in ioapic_.c

Singed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4B84AAC4.2020204@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

authored by Yinghai Lu and committed by H. Peter Anvin 28c6a0ba 3746c6b6

+3 -7
-1
arch/x86/include/asm/irq.h
··· 48 extern int vector_used_by_percpu_irq(unsigned int vector); 49 50 extern void init_ISA_irqs(void); 51 - extern int nr_legacy_irqs; 52 53 #endif /* _ASM_X86_IRQ_H */
··· 48 extern int vector_used_by_percpu_irq(unsigned int vector); 49 50 extern void init_ISA_irqs(void); 51 52 #endif /* _ASM_X86_IRQ_H */
+1 -1
arch/x86/kernel/apic/io_apic.c
··· 1440 * controllers like 8259. Now that IO-APIC can handle this irq, update 1441 * the cfg->domain. 1442 */ 1443 - if (irq < nr_legacy_irqs && cpumask_test_cpu(0, cfg->domain)) 1444 apic->vector_allocation_domain(0, cfg->domain); 1445 1446 if (assign_irq_vector(irq, cfg, apic->target_cpus()))
··· 1440 * controllers like 8259. Now that IO-APIC can handle this irq, update 1441 * the cfg->domain. 1442 */ 1443 + if (irq < legacy_pic->nr_legacy_irqs && cpumask_test_cpu(0, cfg->domain)) 1444 apic->vector_allocation_domain(0, cfg->domain); 1445 1446 if (assign_irq_vector(irq, cfg, apic->target_cpus()))
+2 -5
arch/x86/kernel/irqinit.c
··· 99 return 0; 100 } 101 102 - /* Number of legacy interrupts */ 103 - int nr_legacy_irqs __read_mostly = NR_IRQS_LEGACY; 104 - 105 void __init init_ISA_irqs(void) 106 { 107 int i; ··· 111 /* 112 * 16 old-style INTA-cycle interrupts: 113 */ 114 - for (i = 0; i < NR_IRQS_LEGACY; i++) { 115 struct irq_desc *desc = irq_to_desc(i); 116 117 desc->status = IRQ_DISABLED; ··· 135 * then this vector space can be freed and re-used dynamically as the 136 * irq's migrate etc. 137 */ 138 - for (i = 0; i < nr_legacy_irqs; i++) 139 per_cpu(vector_irq, 0)[IRQ0_VECTOR + i] = i; 140 141 x86_init.irqs.intr_init();
··· 99 return 0; 100 } 101 102 void __init init_ISA_irqs(void) 103 { 104 int i; ··· 114 /* 115 * 16 old-style INTA-cycle interrupts: 116 */ 117 + for (i = 0; i < legacy_pic->nr_legacy_irqs; i++) { 118 struct irq_desc *desc = irq_to_desc(i); 119 120 desc->status = IRQ_DISABLED; ··· 138 * then this vector space can be freed and re-used dynamically as the 139 * irq's migrate etc. 140 */ 141 + for (i = 0; i < legacy_pic->nr_legacy_irqs; i++) 142 per_cpu(vector_irq, 0)[IRQ0_VECTOR + i] = i; 143 144 x86_init.irqs.intr_init();