diff options
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/bugs.c | 8 | ||||
-rw-r--r-- | arch/x86/kernel/setup_32.c | 1 | ||||
-rw-r--r-- | include/asm-x86/processor.h | 1 |
4 files changed, 0 insertions, 12 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index a4fc7fc21439..7278295f94d2 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1056,8 +1056,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1056 | [SCSI] Maximum number of LUNs received. | 1056 | [SCSI] Maximum number of LUNs received. |
1057 | Should be between 1 and 16384. | 1057 | Should be between 1 and 16384. |
1058 | 1058 | ||
1059 | mca-pentium [BUGS=X86-32] | ||
1060 | |||
1061 | mcatest= [IA-64] | 1059 | mcatest= [IA-64] |
1062 | 1060 | ||
1063 | mce [X86-32] Machine Check Exception | 1061 | mce [X86-32] Machine Check Exception |
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 9b95edcfc6ae..027e5c003b16 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c | |||
@@ -25,14 +25,6 @@ static int __init no_halt(char *s) | |||
25 | 25 | ||
26 | __setup("no-hlt", no_halt); | 26 | __setup("no-hlt", no_halt); |
27 | 27 | ||
28 | static int __init mca_pentium(char *s) | ||
29 | { | ||
30 | mca_pentium_flag = 1; | ||
31 | return 1; | ||
32 | } | ||
33 | |||
34 | __setup("mca-pentium", mca_pentium); | ||
35 | |||
36 | static int __init no_387(char *s) | 28 | static int __init no_387(char *s) |
37 | { | 29 | { |
38 | boot_cpu_data.hard_math = 0; | 30 | boot_cpu_data.hard_math = 0; |
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 691ab4cb167b..a1d7071a51c9 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -164,7 +164,6 @@ unsigned long mmu_cr4_features = X86_CR4_PAE; | |||
164 | unsigned int machine_id; | 164 | unsigned int machine_id; |
165 | unsigned int machine_submodel_id; | 165 | unsigned int machine_submodel_id; |
166 | unsigned int BIOS_revision; | 166 | unsigned int BIOS_revision; |
167 | unsigned int mca_pentium_flag; | ||
168 | 167 | ||
169 | /* Boot loader ID as an integer, for the benefit of proc_dointvec */ | 168 | /* Boot loader ID as an integer, for the benefit of proc_dointvec */ |
170 | int bootloader_type; | 169 | int bootloader_type; |
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index 149920dcd341..7b1ca1f90283 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h | |||
@@ -671,7 +671,6 @@ extern void init_gdt(int cpu); | |||
671 | extern unsigned int machine_id; | 671 | extern unsigned int machine_id; |
672 | extern unsigned int machine_submodel_id; | 672 | extern unsigned int machine_submodel_id; |
673 | extern unsigned int BIOS_revision; | 673 | extern unsigned int BIOS_revision; |
674 | extern unsigned int mca_pentium_flag; | ||
675 | 674 | ||
676 | /* Boot loader type from the setup header */ | 675 | /* Boot loader type from the setup header */ |
677 | extern int bootloader_type; | 676 | extern int bootloader_type; |