Patchwork [2/4] x86, mce: Rename cpu_specific_poll to mce_cpu_specific_poll

login
register
mail settings
Submitter Andy Whitcroft
Date Feb. 10, 2010, 4:20 p.m.
Message ID <1265818860-32016-3-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/45043/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Andy Whitcroft - Feb. 10, 2010, 4:20 p.m.
From: H. Peter Anvin <hpa@zytor.com>

commit f91c4d2649531cc36e10c6bc0f92d0f99116b209 upstream (linux-2.6-tip)

cpu_specific_poll is a global variable, and it should have a global
namespace name.  Since it is MCE-specific (it takes a struct mce *),
rename it mce_cpu_specific_poll.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Andi Kleen <andi@firstfloor.org>
LKML-Reference: <20100121221711.GA8242@basil.fritz.box>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 arch/x86/kernel/cpu/mcheck/mce-internal.h |    2 +-
 arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c |    4 ++--
 arch/x86/kernel/cpu/mcheck/mce.c          |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

Patch

diff --git a/arch/x86/kernel/cpu/mcheck/mce-internal.h b/arch/x86/kernel/cpu/mcheck/mce-internal.h
index d5b7eec..8e7c2f4 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-internal.h
+++ b/arch/x86/kernel/cpu/mcheck/mce-internal.h
@@ -28,4 +28,4 @@  extern int mce_ser;
 
 extern struct mce_bank *mce_banks;
 
-extern void (*cpu_specific_poll)(struct mce *);
+extern void (*mce_cpu_specific_poll)(struct mce *);
diff --git a/arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c b/arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c
index 67ad39b..e09b736 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c
@@ -396,7 +396,7 @@  static int __init xeon75xx_mce_init(void)
 	pr_info("Found Xeon75xx PFA memory error translation table at %x\n",
 		addr);
 	mb();
-	cpu_specific_poll = xeon75xx_mce_poll;
+	mce_cpu_specific_poll = xeon75xx_mce_poll;
 	return 0;
 
 error_unmap:
@@ -412,7 +412,7 @@  MODULE_DESCRIPTION("Intel Xeon 75xx specific DIMM error reporting");
 #ifdef CONFIG_MODULE
 static void __exit xeon75xx_mce_exit(void)
 {
-	cpu_specific_poll = NULL;
+	mce_cpu_specific_poll = NULL;
 	wmb();
 	/* Wait for all machine checks to finish before really unloading */
 	synchronize_rcu();
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 2067627..f5a96ef 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -91,8 +91,8 @@  static void default_decode_mce(struct mce *m)
 	pr_emerg("Run the message through 'mcelog --ascii' to decode.\n");
 }
 
-void				(*cpu_specific_poll)(struct mce *);
-EXPORT_SYMBOL_GPL(cpu_specific_poll);
+void				(*mce_cpu_specific_poll)(struct mce *);
+EXPORT_SYMBOL_GPL(mce_cpu_specific_poll);
 
 /*
  * CPU/chipset specific EDAC code can register a callback here to print
@@ -562,8 +562,8 @@  void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
 		if (!(flags & MCP_TIMESTAMP))
 			m.tsc = 0;
 
-		if (cpu_specific_poll && !under_injection() && !mce_dont_log_ce)
-			cpu_specific_poll(&m);
+		if (mce_cpu_specific_poll && !under_injection() && !mce_dont_log_ce)
+			mce_cpu_specific_poll(&m);
 
 		/*
 		 * Don't get the IP here because it's unlikely to