Commit-ID: d7c3c9a609563868d8a70e220399d06a25aba095
Gitweb: http://git.kernel.org/tip/d7c3c9a609563868d8a70e220399d06a25aba095
Author: Andi Kleen <ak@xxxxxxxxxxxxxxx>
AuthorDate: Tue, 28 Apr 2009 23:07:25 +0200
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Thu, 28 May 2009 09:24:12 -0700
x86, mce: move mce_disabled option into common 32bit/64bit code
It's the same function, so let's share it.
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/x86/kernel/cpu/mcheck/mce.c | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 6ab4770..5395200 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -908,16 +908,6 @@ static struct miscdevice mce_log_device = {
};
/*
- * Old style boot options parsing. Only for compatibility.
- */
-static int __init mcheck_disable(char *str)
-{
- mce_disabled = 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.
@@ -1327,19 +1317,22 @@ void mcheck_init(struct cpuinfo_x86 *c)
printk(KERN_INFO "mce: CPU supports %d MCE banks\n", nr_mce_banks);
}
-static int __init mcheck_disable(char *str)
-{
- mce_disabled = 1;
- return 1;
-}
-
static int __init mcheck_enable(char *str)
{
mce_disabled = -1;
return 1;
}
-__setup("nomce", mcheck_disable);
__setup("mce", mcheck_enable);
-#endif /* CONFIG_X86_32 */
+#endif /* CONFIG_X86_OLD_MCE */
+
+/*
+ * Old style boot options parsing. Only for compatibility.
+ */
+static int __init mcheck_disable(char *str)
+{
+ mce_disabled = 1;
+ return 1;
+}
+__setup("nomce", mcheck_disable);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|