diff options
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 8ae808d110f4..ce3c6fb4f357 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -3639,7 +3639,7 @@ int __init io_apic_get_redir_entries (int ioapic) | |||
3639 | return reg_01.bits.entries + 1; | 3639 | return reg_01.bits.entries + 1; |
3640 | } | 3640 | } |
3641 | 3641 | ||
3642 | void __init probe_nr_irqs_gsi(void) | 3642 | static void __init probe_nr_irqs_gsi(void) |
3643 | { | 3643 | { |
3644 | int nr; | 3644 | int nr; |
3645 | 3645 | ||
@@ -3951,7 +3951,7 @@ static struct resource * __init ioapic_setup_resources(int nr_ioapics) | |||
3951 | return res; | 3951 | return res; |
3952 | } | 3952 | } |
3953 | 3953 | ||
3954 | void __init ioapic_init_mappings(void) | 3954 | void __init ioapic_and_gsi_init(void) |
3955 | { | 3955 | { |
3956 | unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0; | 3956 | unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0; |
3957 | struct resource *ioapic_res; | 3957 | struct resource *ioapic_res; |
@@ -3989,6 +3989,8 @@ fake_ioapic_page: | |||
3989 | ioapic_res->end = ioapic_phys + IO_APIC_SLOT_SIZE - 1; | 3989 | ioapic_res->end = ioapic_phys + IO_APIC_SLOT_SIZE - 1; |
3990 | ioapic_res++; | 3990 | ioapic_res++; |
3991 | } | 3991 | } |
3992 | |||
3993 | probe_nr_irqs_gsi(); | ||
3992 | } | 3994 | } |
3993 | 3995 | ||
3994 | void __init ioapic_insert_resources(void) | 3996 | void __init ioapic_insert_resources(void) |