Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08cd93f9 authored Feb 14, 2008 by Adrian Bunk Committed by Ingo Molnar Feb 19, 2008

remove mca-pentium



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>

parent 9a4c8546

Documentation/kernel-parameters.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -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

arch/x86/kernel/cpu/bugs.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -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;

arch/x86/kernel/setup_32.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;

include/asm-x86/processor.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;