Skip to content

Commit d5b4bb4

Browse files
committed
Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Pull the MCA deletion branch from Paul Gortmaker: "It was good that we could support MCA machines back in the day, but realistically, nobody is using them anymore. They were mostly limited to 386-sx 16MHz CPU and some 486 class machines and never more than 64MB of RAM. Even the enthusiast hobbyist community seems to have dried up close to ten years ago, based on what you can find searching various websites dedicated to the relatively short lived hardware. So lets remove the support relating to CONFIG_MCA. There is no point carrying this forward, wasting cycles doing routine maintenance on it; wasting allyesconfig build time on validating it, wasting I/O on git grep'ping over it, and so on." Let's see if anybody screams. It generally has compiled, and James Bottomley pointed out that there was a MCA extension from NCR that allowed for up to 4GB of memory and PPro-class machines. So in *theory* there may be users out there. But even James (technically listed as a maintainer) doesn't actually have a system, and while Alan Cox claims to have a machine in his cellar that he offered to anybody who wants to take it off his hands, he didn't argue for keeping MCA support either. So we could bring it back. But somebody had better speak up and talk about how they have actually been using said MCA hardware with modern kernels for us to do that. And David already took the patch to delete all the networking driver code (commit a5e371f: "drivers/net: delete all code/drivers depending on CONFIG_MCA"). * 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: MCA: delete all remaining traces of microchannel bus support. scsi: delete the MCA specific drivers and driver code serial: delete the MCA specific 8250 support. arm: remove ability to select CONFIG_MCA
2 parents c80ddb5 + bb8187d commit d5b4bb4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+32
-8033
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
@@ -847,13 +847,7 @@ Your cooperation is appreciated.
847847
...
848848
31 = /dev/tap15 16th Ethertap device
849849

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

858852
37 char IDE tape
859853
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)