Consistent device naming (patch for 2.1.44-pre3)

Henrik Storner (storner@osiris.ping.dk)
Tue, 1 Jul 1997 00:28:24 +2600 (MET DST)

I just finished installing the new procps suite (1.12), and the new
lsdev program caught my eye. It provides a handy overview of the IRQ,
I/O ports and DMA channels used by a device.

However, it matches on the strings passed to the request_*
functions. This made it very clear that the current kernel is not
entirely consistent in its device naming, especially when it comes to
the math coprocessor: "npu" is used for the I/O ports, "math error" is
used for the IRQ, and "fpu" is used in the 'Checking 386/387 coupling'
message issued at boot.

This patch makes them all use "fpu". "npu" isn't as common (IMHO) as
"fpu", and "math error" simply sounds wrong. Applies to 2.1.44-pre3,
but probably to most of the kernel sources.

--- linux/arch/i386/kernel/irq.c.orig Tue Jul 1 00:06:55 1997
+++ linux/arch/i386/kernel/irq.c Tue Jul 1 00:07:08 1997
@@ -208,7 +208,7 @@
math_error();
}

-static struct irqaction irq13 = { math_error_irq, 0, 0, "math error", NULL, NULL };
+static struct irqaction irq13 = { math_error_irq, 0, 0, "fpu", NULL, NULL };

/*
* IRQ2 is cascade interrupt to second interrupt controller
--- linux/arch/i386/kernel/setup.c.orig Tue Jul 1 00:06:31 1997
+++ linux/arch/i386/kernel/setup.c Tue Jul 1 00:07:39 1997
@@ -219,7 +219,7 @@
request_region(0x40,0x20,"timer");
request_region(0x80,0x10,"dma page reg");
request_region(0xc0,0x20,"dma2");
- request_region(0xf0,0x10,"npu");
+ request_region(0xf0,0x10,"fpu");
}

static const char * i486model(unsigned int nr)

-- 
Henrik Storner <storner@osiris.ping.dk>  http://eolicom.olicom.dk/~storner/ 
"The POP3 server service depends on the SMTP server service, which
 failed to start because of the following error:
 The operation completed successfully." -Windows NT Server v3.51