2009-03-26 08:40:15

by Hidetoshi Seto

Subject: [PATCH -tip 2/3] x86, mce: Cleanup param parser

- Fix the comment formatting.
- The error path does not return 0, and printk lacks level and "\n".
- Move __setup("nomce") next to mcheck_disable().
- Improve readability etc.

Signed-off-by: Hidetoshi Seto <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
arch/x86/kernel/cpu/mcheck/mce_64.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index 863f895..33d612e 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -838,25 +838,29 @@ static int __init mcheck_disable(char *str)
mce_dont_init = 1;
return 1;
}
+__setup("nomce", mcheck_disable);

-/* mce=off disables machine check.
- mce=TOLERANCELEVEL (number, see above)
- mce=bootlog Log MCEs from before booting. Disabled by default on AMD.
- mce=nobootlog Don't log MCEs from before booting. */
+/*
+ * mce=off disables machine check
+ * mce=TOLERANCELEVEL (number, see above)
+ * mce=bootlog Log MCEs from before booting. Disabled by default on AMD.
+ * mce=nobootlog Don't log MCEs from before booting.
+ */
static int __init mcheck_enable(char *str)
{
if (!strcmp(str, "off"))
mce_dont_init = 1;
- else if (!strcmp(str, "bootlog") || !strcmp(str,"nobootlog"))
- mce_bootlog = str[0] == 'b';
+ else if (!strcmp(str, "bootlog") || !strcmp(str, "nobootlog"))
+ mce_bootlog = (str[0] == 'b');
else if (isdigit(str[0]))
get_option(&str, &tolerant);
- else
- printk("mce= argument %s ignored. Please use /sys", str);
+ else {
+ printk(KERN_INFO "mce= argument %s ignored. Please use /sys\n",
+ str);
+ return 0;
+ }
return 1;
}
-
-__setup("nomce", mcheck_disable);
__setup("mce=", mcheck_enable);

/*
--
1.6.2.1

2009-03-26 09:35:36

by Andi Kleen

Subject: Re: [PATCH -tip 2/3] x86, mce: Cleanup param parser

Hidetoshi Seto wrote:
> - Fix the comment formatting.
> - The error path does not return 0, and printk lacks level and "\n".
> - Move __setup("nomce") next to mcheck_disable().
> - Improve readability etc.

Looks good.

-Andi

2009-03-27 09:45:47

by Hidetoshi Seto

Subject: Re: [PATCH -tip 2/3] x86, mce: Cleanup param parser

Andi Kleen wrote:
> Hidetoshi Seto wrote:
>> - Fix the comment formatting.
>> - The error path does not return 0, and printk lacks level and "\n".
>> - Move __setup("nomce") next to mcheck_disable().
>> - Improve readability etc.
>
> Looks good.

Thank you for reviewing!

This cleanup can stand alone, so could you apply this onto -tip?
# Or would you request me to resend it with subject stripped "2/3"?

Thanks,
H.Seto

2009-03-27 11:33:58

by Andi Kleen

Subject: Re: [PATCH -tip 2/3] x86, mce: Cleanup param parser

Hidetoshi Seto wrote:
> Andi Kleen wrote:
>> Hidetoshi Seto wrote:
>>> - Fix the comment formatting.
>>> - The error path does not return 0, and printk lacks level and "\n".
>>> - Move __setup("nomce") next to mcheck_disable().
>>> - Improve readability etc.
>> Looks good.
>
> Thank you for reviewing!
>
> This cleanup can stand alone, so could you apply this onto -tip?
> # Or would you request me to resend it with subject stripped "2/3"?


I can add it into my pile. I don't have direct access to tip

-Andi

2009-03-28 21:31:50

by Hidetoshi Seto

Subject: [tip:x86/mce2] x86, mce: Cleanup param parser

Commit-ID: 38719db5cf9b8b22bbe2731d736bf271c803e0b0
Gitweb: http://git.kernel.org/tip/38719db5cf9b8b22bbe2731d736bf271c803e0b0
Author: Hidetoshi Seto <[email protected]>
AuthorDate: Thu, 26 Mar 2009 17:39:20 +0900
Committer: Ingo Molnar <[email protected]>
CommitDate: Sat, 28 Mar 2009 13:12:55 +0100

x86, mce: Cleanup param parser

Impact: cleanup

- Fix the comment formatting.

- The error path does not return 0, and printk lacks level and "\n".

- Move __setup("nomce") next to mcheck_disable().

- Improve readability etc.

Signed-off-by: Hidetoshi Seto <[email protected]>
Acked-by: Andi Kleen <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>


---
arch/x86/kernel/cpu/mcheck/mce_64.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index ca14604..9bf52bd 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -838,25 +838,29 @@ static int __init mcheck_disable(char *str)
mce_dont_init = 1;
return 1;
}
+__setup("nomce", mcheck_disable);

-/* mce=off disables machine check.
- mce=TOLERANCELEVEL (number, see above)
- mce=bootlog Log MCEs from before booting. Disabled by default on AMD.
- mce=nobootlog Don't log MCEs from before booting. */
+/*
+ * mce=off disables machine check
+ * mce=TOLERANCELEVEL (number, see above)
+ * mce=bootlog Log MCEs from before booting. Disabled by default on AMD.
+ * mce=nobootlog Don't log MCEs from before booting.
+ */
static int __init mcheck_enable(char *str)
{
if (!strcmp(str, "off"))
mce_dont_init = 1;
- else if (!strcmp(str, "bootlog") || !strcmp(str,"nobootlog"))
- mce_bootlog = str[0] == 'b';
+ else if (!strcmp(str, "bootlog") || !strcmp(str, "nobootlog"))
+ mce_bootlog = (str[0] == 'b');
else if (isdigit(str[0]))
get_option(&str, &tolerant);
- else
- printk("mce= argument %s ignored. Please use /sys", str);
+ else {
+ printk(KERN_INFO "mce= argument %s ignored. Please use /sys\n",
+ str);
+ return 0;
+ }
return 1;
}
-
-__setup("nomce", mcheck_disable);
__setup("mce=", mcheck_enable);

/*