Commit d6126ef5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Tony Luck

x86/mce: Convert static array of pointers to per-cpu variables

When I previously fixed up the mce_device code, I used a static array of
the pointers.  It was (rightfully) pointed out to me that I should be
using the per_cpu code instead.

This patch converts the code over to that structure, moving the variable
back into the per_cpu area, like it used to be for 3.2 and earlier.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Reviewed-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Link: https://lkml.org/lkml/2012/1/27/165Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent b01543df
...@@ -151,7 +151,7 @@ static inline void enable_p5_mce(void) {} ...@@ -151,7 +151,7 @@ static inline void enable_p5_mce(void) {}
void mce_setup(struct mce *m); void mce_setup(struct mce *m);
void mce_log(struct mce *m); void mce_log(struct mce *m);
extern struct device *mce_device[CONFIG_NR_CPUS]; DECLARE_PER_CPU(struct device *, mce_device);
/* /*
* Maximum banks number. * Maximum banks number.
......
...@@ -1859,7 +1859,7 @@ static struct bus_type mce_subsys = { ...@@ -1859,7 +1859,7 @@ static struct bus_type mce_subsys = {
.dev_name = "machinecheck", .dev_name = "machinecheck",
}; };
struct device *mce_device[CONFIG_NR_CPUS]; DEFINE_PER_CPU(struct device *, mce_device);
__cpuinitdata __cpuinitdata
void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu); void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);
...@@ -2038,7 +2038,7 @@ static __cpuinit int mce_device_create(unsigned int cpu) ...@@ -2038,7 +2038,7 @@ static __cpuinit int mce_device_create(unsigned int cpu)
goto error2; goto error2;
} }
cpumask_set_cpu(cpu, mce_device_initialized); cpumask_set_cpu(cpu, mce_device_initialized);
mce_device[cpu] = dev; per_cpu(mce_device, cpu) = dev;
return 0; return 0;
error2: error2:
...@@ -2055,7 +2055,7 @@ static __cpuinit int mce_device_create(unsigned int cpu) ...@@ -2055,7 +2055,7 @@ static __cpuinit int mce_device_create(unsigned int cpu)
static __cpuinit void mce_device_remove(unsigned int cpu) static __cpuinit void mce_device_remove(unsigned int cpu)
{ {
struct device *dev = mce_device[cpu]; struct device *dev = per_cpu(mce_device, cpu);
int i; int i;
if (!cpumask_test_cpu(cpu, mce_device_initialized)) if (!cpumask_test_cpu(cpu, mce_device_initialized))
...@@ -2069,7 +2069,7 @@ static __cpuinit void mce_device_remove(unsigned int cpu) ...@@ -2069,7 +2069,7 @@ static __cpuinit void mce_device_remove(unsigned int cpu)
device_unregister(dev); device_unregister(dev);
cpumask_clear_cpu(cpu, mce_device_initialized); cpumask_clear_cpu(cpu, mce_device_initialized);
mce_device[cpu] = NULL; per_cpu(mce_device, cpu) = NULL;
} }
/* Make sure there are no machine checks on offlined CPUs. */ /* Make sure there are no machine checks on offlined CPUs. */
......
...@@ -523,7 +523,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) ...@@ -523,7 +523,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
{ {
int i, err = 0; int i, err = 0;
struct threshold_bank *b = NULL; struct threshold_bank *b = NULL;
struct device *dev = mce_device[cpu]; struct device *dev = per_cpu(mce_device, cpu);
char name[32]; char name[32];
sprintf(name, "threshold_bank%i", bank); sprintf(name, "threshold_bank%i", bank);
...@@ -585,7 +585,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) ...@@ -585,7 +585,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
if (i == cpu) if (i == cpu)
continue; continue;
dev = mce_device[i]; dev = per_cpu(mce_device, i);
if (dev) if (dev)
err = sysfs_create_link(&dev->kobj,b->kobj, name); err = sysfs_create_link(&dev->kobj,b->kobj, name);
if (err) if (err)
...@@ -665,7 +665,8 @@ static void threshold_remove_bank(unsigned int cpu, int bank) ...@@ -665,7 +665,8 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* sibling symlink */ /* sibling symlink */
if (shared_bank[bank] && b->blocks->cpu != cpu) { if (shared_bank[bank] && b->blocks->cpu != cpu) {
sysfs_remove_link(&mce_device[cpu]->kobj, name); dev = per_cpu(mce_device, cpu);
sysfs_remove_link(&dev->kobj, name);
per_cpu(threshold_banks, cpu)[bank] = NULL; per_cpu(threshold_banks, cpu)[bank] = NULL;
return; return;
...@@ -677,7 +678,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank) ...@@ -677,7 +678,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
if (i == cpu) if (i == cpu)
continue; continue;
dev = mce_device[i]; dev = per_cpu(mce_device, i);
if (dev) if (dev)
sysfs_remove_link(&dev->kobj, name); sysfs_remove_link(&dev->kobj, name);
per_cpu(threshold_banks, i)[bank] = NULL; per_cpu(threshold_banks, i)[bank] = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment