Skip to content

Commit bb8187d

Browse files
author
Paul Gortmaker
committed
MCA: delete all remaining traces of microchannel bus support.
Hardware with MCA bus is limited to 386 and 486 class machines that are now 20+ years old and typically with less than 32MB of memory. A quick search on the internet, and you see that even the MCA hobbyist/enthusiast community has lost interest in the early 2000 era and never really even moved ahead from the 2.4 kernels to the 2.6 series. This deletes anything remaining related to CONFIG_MCA from core kernel code and from the x86 architecture. There is no point in carrying this any further into the future. One complication to watch for is inadvertently scooping up stuff relating to machine check, since there is overlap in the TLA name space (e.g. arch/x86/boot/mca.c). Cc: Thomas Gleixner <tglx@linutronix.de> Cc: James Bottomley <JBottomley@Parallels.com> Cc: x86@kernel.org Acked-by: Ingo Molnar <mingo@elte.hu> Acked-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
1 parent a88dc06 commit bb8187d

38 files changed

+15
-2526
lines changed

‎Documentation/00-INDEX

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ m68k/
218218
- directory with info about Linux on Motorola 68k architecture.
219219
magic-number.txt
220220
- list of magic numbers used to mark/protect kernel data structures.
221-
mca.txt
222-
- info on supporting Micro Channel Architecture (e.g. PS/2) systems.
223221
md.txt
224222
- info on boot arguments for the multiple devices driver.
225223
memory-barriers.txt

‎Documentation/DocBook/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# To add a new book the only step required is to add the book to the
77
# list of DOCBOOKS.
88

9-
DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
9+
DOCBOOKS := z8530book.xml device-drivers.xml \
1010
kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
1111
writing_usb_driver.xml networking.xml \
1212
kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

‎Documentation/DocBook/kernel-api.tmpl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -212,19 +212,6 @@ X!Edrivers/pci/hotplug.c
212212
<sect1><title>PCI Hotplug Support Library</title>
213213
!Edrivers/pci/hotplug/pci_hotplug_core.c
214214
</sect1>
215-
<sect1><title>MCA Architecture</title>
216-
<sect2><title>MCA Device Functions</title>
217-
<para>
218-
Refer to the file arch/x86/kernel/mca_32.c for more information.
219-
</para>
220-
<!-- FIXME: Removed for now since no structured comments in source
221-
X!Earch/x86/kernel/mca_32.c
222-
-->
223-
</sect2>
224-
<sect2><title>MCA Bus DMA</title>
225-
!Iarch/x86/include/asm/mca_dma.h
226-
</sect2>
227-
</sect1>
228215
</chapter>
229216

230217
<chapter id="firmware">

‎Documentation/DocBook/mcabook.tmpl

Lines changed: 0 additions & 107 deletions
This file was deleted.

‎Documentation/devices.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -846,13 +846,7 @@ Your cooperation is appreciated.
846846
...
847847
31 = /dev/tap15 16th Ethertap device
848848

849-
36 block MCA ESDI hard disk
850-
0 = /dev/eda First ESDI disk whole disk
851-
64 = /dev/edb Second ESDI disk whole disk
852-
...
853-
854-
Partitions are handled in the same way as IDE disks
855-
(see major number 3).
849+
36 block OBSOLETE (was MCA ESDI hard disk)
856850

857851
37 char IDE tape
858852
0 = /dev/ht0 First IDE tape

‎Documentation/eisa.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ CONFIG_ALPHA_JENSEN or CONFIG_EISA_VLB_PRIMING are set.
179179

180180
Converting an EISA driver to the new API mostly involves *deleting*
181181
code (since probing is now in the core EISA code). Unfortunately, most
182-
drivers share their probing routine between ISA, MCA and EISA. Special
182+
drivers share their probing routine between ISA, and EISA. Special
183183
care must be taken when ripping out the EISA code, so other busses
184184
won't suffer from these surgical strikes...
185185

‎Documentation/kernel-parameters.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ parameter is applicable:
7070
M68k M68k architecture is enabled.
7171
These options have more detailed description inside of
7272
Documentation/m68k/kernel-options.txt.
73-
MCA MCA bus support is enabled.
7473
MDA MDA console support is enabled.
7574
MIPS MIPS architecture is enabled.
7675
MOUSE Appropriate mouse support is enabled.

0 commit comments

Comments
 (0)