aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-04-04 15:41:13 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:34 -0400
commit9f640ccbc67b7c306206502bca420a80ad15c965 (patch)
treeacc2d5322afa7e8f92263bba38fb84a899ab1d37 /arch/x86/kernel
parentba1ce61ff226bddebd2101a29fe56b4664ef7cec (diff)
x86: move mp_ioapics to io_apic_32.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/io_apic_32.c4
-rw-r--r--arch/x86/kernel/mpparse_32.c5
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 */
72int nr_ioapic_registers[MAX_IO_APICS]; 72int nr_ioapic_registers[MAX_IO_APICS];
73 73
74/* I/O APIC entries */
75struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS];
76int nr_ioapics;
77
74static int disable_timer_pin_1 __initdata; 78static 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);
47int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; 47int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
48static int mp_current_pci_id; 48static int mp_current_pci_id;
49 49
50/* I/O APIC entries */
51struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS];
52
53/* # of MP IRQ source entries */ 50/* # of MP IRQ source entries */
54struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; 51struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
55 52
56/* MP IRQ source entries */ 53/* MP IRQ source entries */
57int mp_irq_entries; 54int mp_irq_entries;
58 55
59int nr_ioapics;
60
61int pic_mode; 56int 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: */