From: Andi Kleen <andi@firstfloor.org>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] [5/10] MCE: Rename mce_dont_init on 64bit to mce_disabled
Date: Tue, 8 Jul 2008 01:10:07 +0200 (CEST) [thread overview]
Message-ID: <20080707231007.98F8C1B4315@basil.firstfloor.org> (raw)
In-Reply-To: <20080708110.487722491@firstfloor.org>
This way they are the same between 32bit and 64bit and no special
cases needed. The semantics were always the same.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
arch/x86/kernel/cpu/mcheck/mce_64.c | 8 ++++----
include/asm-x86/mce.h | 2 --
2 files changed, 4 insertions(+), 6 deletions(-)
Index: linux/arch/x86/kernel/cpu/mcheck/mce_64.c
===================================================================
--- linux.orig/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ linux/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -35,7 +35,7 @@
atomic_t mce_entry;
-static int mce_dont_init;
+int mce_disabled __cpuinitdata;
/*
* Tolerant levels:
@@ -535,7 +535,7 @@ void __cpuinit mcheck_init(struct cpuinf
mce_cpu_quirks(c);
- if (mce_dont_init ||
+ if (mce_disabled ||
cpu_test_and_set(smp_processor_id(), mce_cpus) ||
!mce_available(c))
return;
@@ -722,7 +722,7 @@ void __init restart_mce(void)
*/
static int __init mcheck_disable(char *str)
{
- mce_dont_init = 1;
+ mce_disabled = 1;
return 1;
}
@@ -734,7 +734,7 @@ static int __init mcheck_disable(char *s
static int __init mcheck_enable(char *str)
{
if (!strcmp(str, "off"))
- mce_dont_init = 1;
+ mce_disabled = 1;
else if (!strcmp(str, "bootlog") || !strcmp(str,"nobootlog"))
mce_bootlog = str[0] == 'b';
else if (isdigit(str[0]))
Index: linux/include/asm-x86/mce.h
===================================================================
--- linux.orig/include/asm-x86/mce.h
+++ linux/include/asm-x86/mce.h
@@ -84,9 +84,7 @@ struct mce_log {
#ifdef __KERNEL__
-#ifdef CONFIG_X86_32
extern int mce_disabled;
-#else /* CONFIG_X86_32 */
#include <asm/atomic.h>
next prev parent reply other threads:[~2008-07-07 23:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-07 23:10 [PATCH] [0/10] Use 64bit x86 machine check code for 32bit too v2 Andi Kleen
2008-07-07 23:10 ` [PATCH] [1/10] MCE: Make 64bit mce code 32bit clean v2 Andi Kleen
2008-07-07 23:10 ` [PATCH] [2/10] MCE: Implement the PPro bank 0 quirk in the 64bit machine check code Andi Kleen
2008-07-07 23:10 ` [PATCH] [3/10] MCE: Port K7 bank 0 quirk to 64bit mce code Andi Kleen
2008-07-07 23:10 ` [PATCH] [4/10] MCE: Call 64bit machine check through a call vector Andi Kleen
2008-07-07 23:10 ` Andi Kleen [this message]
2008-07-07 23:10 ` [PATCH] [6/10] MCE: Provide exit_idle dummy functions for 32bit Andi Kleen
2008-07-07 23:10 ` [PATCH] [7/10] MCE: Remove machine check handler idle notify on 64bit Andi Kleen
2008-07-07 23:10 ` [PATCH] [8/10] MCE: Remove oops_begin() use in 64bit machine check Andi Kleen
2008-07-07 23:10 ` [PATCH] [9/10] Add missing includes in mce_intel_64.c Andi Kleen
2008-07-07 23:10 ` [PATCH] [10/10] MCE: Use 64bit machine check code on 32bit v2 Andi Kleen
2008-07-07 23:53 ` [PATCH] [0/10] Use 64bit x86 machine check code for 32bit too v2 H. Peter Anvin
2008-07-08 19:54 ` Max Asbock
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080707231007.98F8C1B4315@basil.firstfloor.org \
--to=andi@firstfloor.org \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome