diff options
Diffstat (limited to 'arch/x86/include/asm/io_apic.h')
| -rw-r--r-- | arch/x86/include/asm/io_apic.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index a6b28d017c2f..f327d386d6cc 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h | |||
| @@ -159,7 +159,7 @@ struct io_apic_irq_attr; | |||
| 159 | extern int io_apic_set_pci_routing(struct device *dev, int irq, | 159 | extern int io_apic_set_pci_routing(struct device *dev, int irq, |
| 160 | struct io_apic_irq_attr *irq_attr); | 160 | struct io_apic_irq_attr *irq_attr); |
| 161 | void setup_IO_APIC_irq_extra(u32 gsi); | 161 | void setup_IO_APIC_irq_extra(u32 gsi); |
| 162 | extern void ioapic_init_mappings(void); | 162 | extern void ioapic_and_gsi_init(void); |
| 163 | extern void ioapic_insert_resources(void); | 163 | extern void ioapic_insert_resources(void); |
| 164 | 164 | ||
| 165 | extern struct IO_APIC_route_entry **alloc_ioapic_entries(void); | 165 | extern struct IO_APIC_route_entry **alloc_ioapic_entries(void); |
| @@ -168,10 +168,10 @@ extern int save_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries); | |||
| 168 | extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries); | 168 | extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries); |
| 169 | extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries); | 169 | extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries); |
| 170 | 170 | ||
| 171 | extern void probe_nr_irqs_gsi(void); | ||
| 172 | extern int get_nr_irqs_gsi(void); | 171 | extern int get_nr_irqs_gsi(void); |
| 173 | 172 | ||
| 174 | extern void setup_ioapic_ids_from_mpc(void); | 173 | extern void setup_ioapic_ids_from_mpc(void); |
| 174 | extern void setup_ioapic_ids_from_mpc_nocheck(void); | ||
| 175 | 175 | ||
| 176 | struct mp_ioapic_gsi{ | 176 | struct mp_ioapic_gsi{ |
| 177 | u32 gsi_base; | 177 | u32 gsi_base; |
| @@ -184,14 +184,15 @@ int mp_find_ioapic_pin(int ioapic, u32 gsi); | |||
| 184 | void __init mp_register_ioapic(int id, u32 address, u32 gsi_base); | 184 | void __init mp_register_ioapic(int id, u32 address, u32 gsi_base); |
| 185 | extern void __init pre_init_apic_IRQ0(void); | 185 | extern void __init pre_init_apic_IRQ0(void); |
| 186 | 186 | ||
| 187 | extern void mp_save_irq(struct mpc_intsrc *m); | ||
| 188 | |||
| 187 | #else /* !CONFIG_X86_IO_APIC */ | 189 | #else /* !CONFIG_X86_IO_APIC */ |
| 188 | 190 | ||
| 189 | #define io_apic_assign_pci_irqs 0 | 191 | #define io_apic_assign_pci_irqs 0 |
| 190 | #define setup_ioapic_ids_from_mpc x86_init_noop | 192 | #define setup_ioapic_ids_from_mpc x86_init_noop |
| 191 | static const int timer_through_8259 = 0; | 193 | static const int timer_through_8259 = 0; |
| 192 | static inline void ioapic_init_mappings(void) { } | 194 | static inline void ioapic_and_gsi_init(void) { } |
| 193 | static inline void ioapic_insert_resources(void) { } | 195 | static inline void ioapic_insert_resources(void) { } |
| 194 | static inline void probe_nr_irqs_gsi(void) { } | ||
| 195 | #define gsi_top (NR_IRQS_LEGACY) | 196 | #define gsi_top (NR_IRQS_LEGACY) |
| 196 | static inline int mp_find_ioapic(u32 gsi) { return 0; } | 197 | static inline int mp_find_ioapic(u32 gsi) { return 0; } |
| 197 | 198 | ||