The check for mca_pentium_flag was removed long ago.
This cleans up the flag and documentation.
Signed-off-by: Andrew Hendry <[email protected]>
diff -uprN -X dontdiff a/arch/i386/kernel/cpu/bugs.c
b/arch/i386/kernel/cpu/bugs.c --- a/arch/i386/kernel/cpu/bugs.c
2007-07-15 12:04:50.000000000 +1000 +++
b/arch/i386/kernel/cpu/bugs.c 2007-07-15 12:01:46.000000000
+1000 @@ -25,14 +25,6 @@ static int __init no_halt(char *s)
__setup("no-hlt", no_halt);
-static int __init mca_pentium(char *s)
-{
- mca_pentium_flag = 1;
- return 1;
-}
-
-__setup("mca-pentium", mca_pentium);
-
static int __init no_387(char *s)
{
boot_cpu_data.hard_math = 0;
diff -uprN -X dontdiff a/arch/i386/kernel/setup.c
b/arch/i386/kernel/setup.c --- a/arch/i386/kernel/setup.c
2007-07-15 12:09:31.000000000 +1000 +++
b/arch/i386/kernel/setup.c 2007-07-15 11:57:17.000000000 +1000
@@ -91,7 +91,6 @@ EXPORT_SYMBOL(machine_id); #endif
unsigned int machine_submodel_id;
unsigned int BIOS_revision;
-unsigned int mca_pentium_flag;
/* Boot loader ID as an integer, for the benefit of proc_dointvec */
int bootloader_type;
diff -uprN -X dontdiff a/Documentation/kernel-parameters.txt
b/Documentation/kernel-parameters.txt ---
a/Documentation/kernel-parameters.txt 2007-07-15
12:04:49.000000000 +1000 +++
b/Documentation/kernel-parameters.txt 2007-07-15
11:58:04.000000000 +1000 @@ -963,8 +963,6 @@ and is between 256 and
4096 characters. [SCSI] Maximum number of LUNs received. Should be
between 1 and 16384.
- mca-pentium [BUGS=IA-32]
-
mcatest= [IA-64]
mcd= [HW,CD]
diff -uprN -X dontdiff a/Documentation/mca.txt b/Documentation/mca.txt
--- a/Documentation/mca.txt 2007-07-15 12:04:49.000000000 +1000
+++ b/Documentation/mca.txt 2007-07-15 11:59:12.000000000 +1000
@@ -213,13 +213,6 @@ detect the guilty device, but it's prett
persistent problem (on some model 70 or 80s, they occur every couple
shell commands), the CONFIG_IGNORE_NMI flag will take care of that.
-Various Pentium machines have had serious problems with the FPU test in
-bugs.h. Basically, the machine hangs after the HLT test. This occurs,
-as far as we know, on the Pentium-equipped 85s, 95s, and some PC
Servers. -The PCI/MCA PC 750s are fine as far as I can tell. The
``mca-pentium'' -boot-prompt flag will disable the FPU bug check if
this is a problem -with your machine.
-
The model 80 has a raft of problems that are just too weird and unique
to get into here. Some people have no trouble while others have
nothing but problems. I'd suspect some problems are related to the age
of the diff -uprN -X dontdiff a/include/asm-i386/processor.h
b/include/asm-i386/processor.h ---
a/include/asm-i386/processor.h 2007-07-15 12:09:23.000000000
+1000 +++ b/include/asm-i386/processor.h 2007-07-15
12:00:45.000000000 +1000 @@ -211,7 +211,6 @@ others may find it useful.
*/ extern unsigned int machine_id; extern unsigned int
machine_submodel_id; extern unsigned int BIOS_revision;
-extern unsigned int mca_pentium_flag;
/* Boot loader type from the setup header */
extern int bootloader_type;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
