x86, mce: Rename cpu_specific_poll to mce_cpu_specific_poll

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>

diff --git a/arch/x86/kernel/cpu/mcheck/mce-internal.h b/arch/x86/kernel/cpu/mcheck/mce-internal.h
index 665887a..28088d2 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce-internal.h
+++ b/arch/x86/kernel/cpu/mcheck/mce-internal.h
@@ -28,7 +28,7 @@ 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 *);
 
 #ifdef CONFIG_ACPI_APEI
 int apei_write_mce(struct mce *m);

diff --git a/arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c b/arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c
index 67ad39b..e09b736 100644 (file)
--- 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 70d6ea0..a555d54 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -118,8 +118,8 @@ static struct notifier_block mce_dec_nb = {
        .priority      = -1,
 };
 
-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);
 
 /* MCA banks polled by the period polling timer for corrected events */
 DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) = {
@@ -591,8 +591,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