diff options
| -rw-r--r-- | arch/x86/include/asm/io_apic.h | 10 | ||||
| -rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index 35832a03a515..feeaf0d92460 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h | |||
| @@ -180,12 +180,12 @@ extern void ioapic_write_entry(int apic, int pin, | |||
| 180 | extern void setup_ioapic_ids_from_mpc(void); | 180 | extern void setup_ioapic_ids_from_mpc(void); |
| 181 | 181 | ||
| 182 | struct mp_ioapic_gsi{ | 182 | struct mp_ioapic_gsi{ |
| 183 | int gsi_base; | 183 | u32 gsi_base; |
| 184 | int gsi_end; | 184 | u32 gsi_end; |
| 185 | }; | 185 | }; |
| 186 | extern struct mp_ioapic_gsi mp_gsi_routing[]; | 186 | extern struct mp_ioapic_gsi mp_gsi_routing[]; |
| 187 | int mp_find_ioapic(int gsi); | 187 | int mp_find_ioapic(u32 gsi); |
| 188 | int mp_find_ioapic_pin(int ioapic, int gsi); | 188 | int mp_find_ioapic_pin(int ioapic, u32 gsi); |
| 189 | void __init mp_register_ioapic(int id, u32 address, u32 gsi_base); | 189 | void __init mp_register_ioapic(int id, u32 address, u32 gsi_base); |
| 190 | extern void __init pre_init_apic_IRQ0(void); | 190 | extern void __init pre_init_apic_IRQ0(void); |
| 191 | 191 | ||
| @@ -197,7 +197,7 @@ static const int timer_through_8259 = 0; | |||
| 197 | static inline void ioapic_init_mappings(void) { } | 197 | static inline void ioapic_init_mappings(void) { } |
| 198 | static inline void ioapic_insert_resources(void) { } | 198 | static inline void ioapic_insert_resources(void) { } |
| 199 | static inline void probe_nr_irqs_gsi(void) { } | 199 | static inline void probe_nr_irqs_gsi(void) { } |
| 200 | static inline int mp_find_ioapic(int gsi) { return 0; } | 200 | static inline int mp_find_ioapic(u32 gsi) { return 0; } |
| 201 | 201 | ||
| 202 | struct io_apic_irq_attr; | 202 | struct io_apic_irq_attr; |
| 203 | static inline int io_apic_set_pci_routing(struct device *dev, int irq, | 203 | static inline int io_apic_set_pci_routing(struct device *dev, int irq, |
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 0a053e61b3ea..9ab97622b8e6 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
| @@ -4247,7 +4247,7 @@ void __init ioapic_insert_resources(void) | |||
| 4247 | } | 4247 | } |
| 4248 | } | 4248 | } |
| 4249 | 4249 | ||
| 4250 | int mp_find_ioapic(int gsi) | 4250 | int mp_find_ioapic(u32 gsi) |
| 4251 | { | 4251 | { |
| 4252 | int i = 0; | 4252 | int i = 0; |
| 4253 | 4253 | ||
| @@ -4262,7 +4262,7 @@ int mp_find_ioapic(int gsi) | |||
| 4262 | return -1; | 4262 | return -1; |
| 4263 | } | 4263 | } |
| 4264 | 4264 | ||
| 4265 | int mp_find_ioapic_pin(int ioapic, int gsi) | 4265 | int mp_find_ioapic_pin(int ioapic, u32 gsi) |
| 4266 | { | 4266 | { |
| 4267 | if (WARN_ON(ioapic == -1)) | 4267 | if (WARN_ON(ioapic == -1)) |
| 4268 | return -1; | 4268 | return -1; |
