diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-04-04 15:41:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:35 -0400 |
commit | 584f734d035db5c5c07f938e464ddeeefde7ec31 (patch) | |
tree | a0dc1f44efb0f60b9e88b3e44c1ddf6e6a57d980 /arch/x86 | |
parent | 9e5c5f1dd29c86307e6b3cfa75e85d0efccc1f6b (diff) |
x86: move mp_irqs to io_apics_32.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 6 | ||||
-rw-r--r-- | arch/x86/kernel/mpparse_32.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 2e01b69a46e0..db1b1f30b650 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -75,6 +75,12 @@ int nr_ioapic_registers[MAX_IO_APICS]; | |||
75 | struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; | 75 | struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; |
76 | int nr_ioapics; | 76 | int nr_ioapics; |
77 | 77 | ||
78 | /* MP IRQ source entries */ | ||
79 | struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; | ||
80 | |||
81 | /* # of MP IRQ source entries */ | ||
82 | int mp_irq_entries; | ||
83 | |||
78 | static int disable_timer_pin_1 __initdata; | 84 | static int disable_timer_pin_1 __initdata; |
79 | 85 | ||
80 | /* | 86 | /* |
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c index b6f1e4e235e3..2b16e5c71a64 100644 --- a/arch/x86/kernel/mpparse_32.c +++ b/arch/x86/kernel/mpparse_32.c | |||
@@ -47,12 +47,6 @@ 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 | /* # of MP IRQ source entries */ | ||
51 | struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; | ||
52 | |||
53 | /* MP IRQ source entries */ | ||
54 | int mp_irq_entries; | ||
55 | |||
56 | int pic_mode; | 50 | int pic_mode; |
57 | 51 | ||
58 | /* Make it easy to share the UP and SMP code: */ | 52 | /* Make it easy to share the UP and SMP code: */ |