diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/mpparse_32.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index bfebe7a1966d..2e01b69a46e0 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -71,6 +71,10 @@ int sis_apic_bug = -1; | |||
71 | */ | 71 | */ |
72 | int nr_ioapic_registers[MAX_IO_APICS]; | 72 | int nr_ioapic_registers[MAX_IO_APICS]; |
73 | 73 | ||
74 | /* I/O APIC entries */ | ||
75 | struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; | ||
76 | int nr_ioapics; | ||
77 | |||
74 | static int disable_timer_pin_1 __initdata; | 78 | static int disable_timer_pin_1 __initdata; |
75 | 79 | ||
76 | /* | 80 | /* |
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c index 44f52f623fd6..302253cbfc6a 100644 --- a/arch/x86/kernel/mpparse_32.c +++ b/arch/x86/kernel/mpparse_32.c | |||
@@ -47,17 +47,12 @@ DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); | |||
47 | int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; | 47 | int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; |
48 | static int mp_current_pci_id; | 48 | static int mp_current_pci_id; |
49 | 49 | ||
50 | /* I/O APIC entries */ | ||
51 | struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; | ||
52 | |||
53 | /* # of MP IRQ source entries */ | 50 | /* # of MP IRQ source entries */ |
54 | struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; | 51 | struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; |
55 | 52 | ||
56 | /* MP IRQ source entries */ | 53 | /* MP IRQ source entries */ |
57 | int mp_irq_entries; | 54 | int mp_irq_entries; |
58 | 55 | ||
59 | int nr_ioapics; | ||
60 | |||
61 | int pic_mode; | 56 | int pic_mode; |
62 | 57 | ||
63 | /* Make it easy to share the UP and SMP code: */ | 58 | /* Make it easy to share the UP and SMP code: */ |