diff options
author | Jacob Pan <jacob.jun.pan@intel.com> | 2010-02-05 04:06:56 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-19 17:16:38 -0800 |
commit | 1f91233c26fd5f7d6525fd29b95e4b50ca7a3e88 (patch) | |
tree | 987d5c535f10cf2d79ce0073936c7e45077f602c /arch/x86/kernel/apic | |
parent | b81bb373a7e832a43921356aa1291044d7f52fb1 (diff) | |
download | op-kernel-dev-1f91233c26fd5f7d6525fd29b95e4b50ca7a3e88.zip op-kernel-dev-1f91233c26fd5f7d6525fd29b95e4b50ca7a3e88.tar.gz |
x86, apic: Remove ioapic_disable_legacy()
The ioapic_disable_legacy() call is no longer needed for platforms do
not have legacy pic. the legacy pic abstraction has taken care it
automatically.
This patch also initialize irq-related static variables based on
information obtained from legacy_pic.
Signed-off-by: Jacob Pan <jacob.jun.pan@intel.com>
LKML-Reference: <43F901BD926A4E43B106BF17856F0755A30A7660@orsmsx508.amr.corp.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/apic')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 1704cd8..3592a72 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -143,11 +143,6 @@ static struct irq_cfg irq_cfgx[NR_IRQS_LEGACY]; static struct irq_cfg irq_cfgx[NR_IRQS]; #endif -void __init io_apic_disable_legacy(void) -{ - nr_irqs_gsi = 0; -} - int __init arch_early_irq_init(void) { struct irq_cfg *cfg; @@ -156,6 +151,11 @@ int __init arch_early_irq_init(void) int node; int i; + if (!legacy_pic->nr_legacy_irqs) { + nr_irqs_gsi = 0; + io_apic_irqs = ~0UL; + } + cfg = irq_cfgx; count = ARRAY_SIZE(irq_cfgx); node= cpu_to_node(boot_cpu_id); |