diff options
author | Andi Kleen <ak@suse.de> | 2006-09-26 04:52:29 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:29 -0400 |
commit | e50991343488edf25d58820be1684322808c763c (patch) | |
tree | 66146dc38d14df9c0c7e9871f7179b304f6b57e5 /arch/x86_64/kernel/mpparse.c | |
parent | 5cb6b99928a8f1a1bbdac7a16b88aef8cb64d432 (diff) |
[PATCH] Remove leftover MCE/EISA support
No 64bit EISA or Microchannel systems ever. Remove the left over code
in the IO-APIC driver and the mptable parser
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.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c index c73dd1f41e65..90e99cf27aa5 100644 --- a/arch/x86_64/kernel/mpparse.c +++ b/arch/x86_64/kernel/mpparse.c | |||
@@ -175,14 +175,10 @@ static void __init MP_bus_info (struct mpc_config_bus *m) | |||
175 | 175 | ||
176 | if (strncmp(str, "ISA", 3) == 0) { | 176 | if (strncmp(str, "ISA", 3) == 0) { |
177 | mp_bus_id_to_type[m->mpc_busid] = MP_BUS_ISA; | 177 | mp_bus_id_to_type[m->mpc_busid] = MP_BUS_ISA; |
178 | } else if (strncmp(str, "EISA", 4) == 0) { | ||
179 | mp_bus_id_to_type[m->mpc_busid] = MP_BUS_EISA; | ||
180 | } else if (strncmp(str, "PCI", 3) == 0) { | 178 | } else if (strncmp(str, "PCI", 3) == 0) { |
181 | mp_bus_id_to_type[m->mpc_busid] = MP_BUS_PCI; | 179 | mp_bus_id_to_type[m->mpc_busid] = MP_BUS_PCI; |
182 | mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id; | 180 | mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id; |
183 | mp_current_pci_id++; | 181 | mp_current_pci_id++; |
184 | } else if (strncmp(str, "MCA", 3) == 0) { | ||
185 | mp_bus_id_to_type[m->mpc_busid] = MP_BUS_MCA; | ||
186 | } else { | 182 | } else { |
187 | printk(KERN_ERR "Unknown bustype %s\n", str); | 183 | printk(KERN_ERR "Unknown bustype %s\n", str); |
188 | } | 184 | } |
@@ -465,14 +461,6 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type) | |||
465 | case 5: | 461 | case 5: |
466 | memcpy(bus.mpc_bustype, "ISA ", 6); | 462 | memcpy(bus.mpc_bustype, "ISA ", 6); |
467 | break; | 463 | break; |
468 | case 2: | ||
469 | case 6: | ||
470 | case 3: | ||
471 | memcpy(bus.mpc_bustype, "EISA ", 6); | ||
472 | break; | ||
473 | case 4: | ||
474 | case 7: | ||
475 | memcpy(bus.mpc_bustype, "MCA ", 6); | ||
476 | } | 464 | } |
477 | MP_bus_info(&bus); | 465 | MP_bus_info(&bus); |
478 | if (mpc_default_type > 4) { | 466 | if (mpc_default_type > 4) { |
@@ -629,9 +617,7 @@ void __init find_intel_smp (void) | |||
629 | smp_scan_config(0xF0000,0x10000)) | 617 | smp_scan_config(0xF0000,0x10000)) |
630 | return; | 618 | return; |
631 | /* | 619 | /* |
632 | * If it is an SMP machine we should know now, unless the | 620 | * If it is an SMP machine we should know now. |
633 | * configuration is in an EISA/MCA bus machine with an | ||
634 | * extended bios data area. | ||
635 | * | 621 | * |
636 | * there is a real-mode segmented pointer pointing to the | 622 | * there is a real-mode segmented pointer pointing to the |
637 | * 4K EBDA area at 0x40E, calculate and scan it here. | 623 | * 4K EBDA area at 0x40E, calculate and scan it here. |