Skip to content

Commit

Permalink
remove mca-pentium
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adrian Bunk authored and Ingo Molnar committed Feb 19, 2008
1 parent 9a4c854 commit 08cd93f
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 12 deletions.
2 changes: 0 additions & 2 deletions Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1056,8 +1056,6 @@ and is between 256 and 4096 characters. It is defined in the file
[SCSI] Maximum number of LUNs received.
Should be between 1 and 16384.

mca-pentium [BUGS=X86-32]

mcatest= [IA-64]

mce [X86-32] Machine Check Exception
Expand Down
8 changes: 0 additions & 8 deletions arch/x86/kernel/cpu/bugs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/setup_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ unsigned long mmu_cr4_features = X86_CR4_PAE;
unsigned int machine_id;
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;
Expand Down
1 change: 0 additions & 1 deletion include/asm-x86/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,6 @@ extern void init_gdt(int cpu);
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;
Expand Down

0 comments on commit 08cd93f

Please sign in to comment.