Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 909dd324fb57ad690c38c4e3d52337defa099ce8

Authored by Andi Kleen
Committed by Thomas Gleixner
1 parent ffecad95ee
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

x86: clean up mce= argument parsing slightly 

Move the = into the __setup line.
Document the option in kernel-parameters.txt by adding a pointer
to the x86-64 specific documentation.

[ tglx: arch/x86 adaptation ]

Pointed out by Robert Day
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

Documentation/kernel-parameters.txt
Diff comments   View file @ 909dd32
... ... @@ -994,6 +994,8 @@
994 994  
995 995 mce [X86-32] Machine Check Exception
996 996  
  997 + mce=option [X86-64] See Documentation/x86_64/boot-options.txt
  998 +
997 999 md= [HW] RAID subsystems devices and level
998 1000 See Documentation/md.txt.
999 1001  
arch/x86/kernel/mce_64.c
Diff comments   View file @ 909dd32
... ... @@ -695,8 +695,6 @@
695 695 mce=nobootlog Don't log MCEs from before booting. */
696 696 static int __init mcheck_enable(char *str)
697 697 {
698   - if (*str == '=')
699   - str++;
700 698 if (!strcmp(str, "off"))
701 699 mce_dont_init = 1;
702 700 else if (!strcmp(str, "bootlog") || !strcmp(str,"nobootlog"))
... ... @@ -709,7 +707,7 @@
709 707 }
710 708  
711 709 __setup("nomce", mcheck_disable);
712   -__setup("mce", mcheck_enable);
  710 +__setup("mce=", mcheck_enable);
713 711  
714 712 /*
715 713 * Sysfs support