This patch removes the mca-pentium boot option that was a noop.

besides the source code cleanup factor, this saves some text as well:

   arch/x86/kernel/cpu/bugs.o:
      text    data     bss     dec     hex filename
       651      77       4     732     2dc bugs.o.before
       631      53       4     688     2b0 bugs.o.after

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Adrian Bunk 2008-02-14 23:23:37 +02:00 коммит произвёл Ingo Molnar
Родитель 9a4c8546f3
Коммит 08cd93f9e1
4 изменённых файлов: 0 добавлений и 12 удалений

Просмотреть файл

@ -1056,8 +1056,6 @@ and is between 256 and 4096 characters. It is defined in the file
[SCSI] Maximum number of LUNs received. [SCSI] Maximum number of LUNs received.
Should be between 1 and 16384. Should be between 1 and 16384.
mca-pentium [BUGS=X86-32]
mcatest= [IA-64] mcatest= [IA-64]
mce [X86-32] Machine Check Exception mce [X86-32] Machine Check Exception

Просмотреть файл

@ -25,14 +25,6 @@ static int __init no_halt(char *s)
__setup("no-hlt", no_halt); __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) static int __init no_387(char *s)
{ {
boot_cpu_data.hard_math = 0; boot_cpu_data.hard_math = 0;

Просмотреть файл

@ -164,7 +164,6 @@ unsigned long mmu_cr4_features = X86_CR4_PAE;
unsigned int machine_id; unsigned int machine_id;
unsigned int machine_submodel_id; unsigned int machine_submodel_id;
unsigned int BIOS_revision; unsigned int BIOS_revision;
unsigned int mca_pentium_flag;
/* Boot loader ID as an integer, for the benefit of proc_dointvec */ /* Boot loader ID as an integer, for the benefit of proc_dointvec */
int bootloader_type; int bootloader_type;

Просмотреть файл

@ -671,7 +671,6 @@ extern void init_gdt(int cpu);
extern unsigned int machine_id; extern unsigned int machine_id;
extern unsigned int machine_submodel_id; extern unsigned int machine_submodel_id;
extern unsigned int BIOS_revision; extern unsigned int BIOS_revision;
extern unsigned int mca_pentium_flag;
/* Boot loader type from the setup header */ /* Boot loader type from the setup header */
extern int bootloader_type; extern int bootloader_type;