diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-05-19 11:47:16 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-25 06:01:26 -0400 |
commit | 8732fc4b237fca3bd3cb0ec87ca8fb90271b0baf (patch) | |
tree | a6f41c61958547956750482f88b768036156998b /arch/x86 | |
parent | ce6444d39fdea29dcf145d2d95fe9cdc850aa53c (diff) |
x86: move mp_bus_not_pci from mpparse.c
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 6 | ||||
-rw-r--r-- | arch/x86/kernel/io_apic_64.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/mpparse.c | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 17b2e8f862d3..2285b81ad1d5 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -81,6 +81,12 @@ struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; | |||
81 | /* # of MP IRQ source entries */ | 81 | /* # of MP IRQ source entries */ |
82 | int mp_irq_entries; | 82 | int mp_irq_entries; |
83 | 83 | ||
84 | #if defined (CONFIG_MCA) || defined (CONFIG_EISA) | ||
85 | int mp_bus_id_to_type[MAX_MP_BUSSES]; | ||
86 | #endif | ||
87 | |||
88 | DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); | ||
89 | |||
84 | static int disable_timer_pin_1 __initdata; | 90 | static int disable_timer_pin_1 __initdata; |
85 | 91 | ||
86 | /* | 92 | /* |
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index 9637675ea555..339cf6f926dc 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
@@ -113,6 +113,8 @@ struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; | |||
113 | /* # of MP IRQ source entries */ | 113 | /* # of MP IRQ source entries */ |
114 | int mp_irq_entries; | 114 | int mp_irq_entries; |
115 | 115 | ||
116 | DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); | ||
117 | |||
116 | /* | 118 | /* |
117 | * Rough estimation of how many shared IRQs there are, can | 119 | * Rough estimation of how many shared IRQs there are, can |
118 | * be changed anytime. | 120 | * be changed anytime. |
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 83dfd6696c2a..e8e041ed84d6 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -33,16 +33,6 @@ | |||
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | /* | 35 | /* |
36 | * Various Linux-internal data structures created from the | ||
37 | * MP-table. | ||
38 | */ | ||
39 | #if defined (CONFIG_MCA) || defined (CONFIG_EISA) | ||
40 | int mp_bus_id_to_type[MAX_MP_BUSSES]; | ||
41 | #endif | ||
42 | |||
43 | DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); | ||
44 | |||
45 | /* | ||
46 | * Checksum an MP configuration block. | 36 | * Checksum an MP configuration block. |
47 | */ | 37 | */ |
48 | 38 | ||