diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-01-21 18:31:54 -0800 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:22:20 -0700 |
| commit | 83313491abe8eec4bffac546348c6c0fc23983ab (patch) | |
| tree | a3e768d04d85cccb9e24d86cdf803fd1f61417f8 /arch | |
| parent | ffc099a34d32b906a0f30743aa93111e6c7a484e (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-internal.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-xeon75xx.c | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-internal.h b/arch/x86/kernel/cpu/mcheck/mce-internal.h index 665887a3970..28088d29a46 100644 --- 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 67ad39b944d..e09b7367ee3 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 528995e2736..1f80e00dcbb 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -102,8 +102,8 @@ static int cpu_missing; ATOMIC_NOTIFIER_HEAD(x86_mce_decoder_chain); EXPORT_SYMBOL_GPL(x86_mce_decoder_chain); -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) = { @@ -556,8 +556,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 |