aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/mpparse.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 04:52:30 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:30 -0400
commit55f05ffaa788e039df2f1ebe0d7bfbcb6f39d0b4 (patch)
tree9b4da733f1afd01fea6622468b41561522e62cfa /arch/x86_64/kernel/mpparse.c
parentdfa4698c50bf85b7927214b0e4a3dc4bc3b3c4a9 (diff)
[PATCH] Replace mp bus array with bitmap for bus not pci
Since we only support PCI and ISA legacy busses now there is no need to have an full array with checking. Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/mpparse.c')
-rw-r--r--arch/x86_64/kernel/mpparse.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index c12acc3b5552..a8d38c0bb449 100644
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -42,7 +42,7 @@ int acpi_found_madt;
42 * MP-table. 42 * MP-table.
43 */ 43 */
44unsigned char apic_version [MAX_APICS]; 44unsigned char apic_version [MAX_APICS];
45unsigned char mp_bus_id_to_type [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; 45DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
46int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; 46int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
47 47
48static int mp_current_pci_id = 0; 48static int mp_current_pci_id = 0;
@@ -173,9 +173,9 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
173 Dprintk("Bus #%d is %s\n", m->mpc_busid, str); 173 Dprintk("Bus #%d is %s\n", m->mpc_busid, str);
174 174
175 if (strncmp(str, "ISA", 3) == 0) { 175 if (strncmp(str, "ISA", 3) == 0) {
176 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_ISA; 176 set_bit(m->mpc_busid, mp_bus_not_pci);
177 } else if (strncmp(str, "PCI", 3) == 0) { 177 } else if (strncmp(str, "PCI", 3) == 0) {
178 mp_bus_id_to_type[m->mpc_busid] = MP_BUS_PCI; 178 clear_bit(m->mpc_busid, mp_bus_not_pci);
179 mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id; 179 mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id;
180 mp_current_pci_id++; 180 mp_current_pci_id++;
181 } else { 181 } else {
@@ -808,8 +808,7 @@ void __init mp_config_acpi_legacy_irqs (void)
808 /* 808 /*
809 * Fabricate the legacy ISA bus (bus #31). 809 * Fabricate the legacy ISA bus (bus #31).
810 */ 810 */
811 mp_bus_id_to_type[MP_ISA_BUS] = MP_BUS_ISA; 811 set_bit(MP_ISA_BUS, mp_bus_not_pci);
812 Dprintk("Bus #%d is ISA\n", MP_ISA_BUS);
813 812
814 /* 813 /*
815 * Locate the IOAPIC that manages the ISA IRQs (0-15). 814 * Locate the IOAPIC that manages the ISA IRQs (0-15).