Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755949AbYGDVWR (ORCPT ); Fri, 4 Jul 2008 17:22:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753506AbYGDVVb (ORCPT ); Fri, 4 Jul 2008 17:21:31 -0400 Received: from smtp-out01.alice-dsl.net ([88.44.60.11]:52819 "EHLO smtp-out01.alice-dsl.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752311AbYGDVVa (ORCPT ); Fri, 4 Jul 2008 17:21:30 -0400 From: Andi Kleen References: <200807041120.678642023@firstfloor.org> In-Reply-To: <200807041120.678642023@firstfloor.org> To: masbock@linux.vnet.ibm.com, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [5/9] MCE: Rename mce_dont_init on 64bit to mce_disabled Message-Id: <20080704212029.C1D211B431F@basil.firstfloor.org> Date: Fri, 4 Jul 2008 23:20:29 +0200 (CEST) X-OriginalArrivalTime: 04 Jul 2008 21:13:07.0330 (UTC) FILETIME=[C1480E20:01C8DE1A] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1930 Lines: 70 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/