diff options
author | Mike Travis <travis@sgi.com> | 2008-05-01 07:35:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 11:04:02 -0400 |
commit | e37d05dad7ff9744efd8ea95a70d389e9a65a6fc (patch) | |
tree | 63d969448b2869294a609ba64912f51b9e556c23 | |
parent | bd7309677c937bf23296f6c81027123c84c5cc5c (diff) |
cpu: change cpu_sys_devices from array to per_cpu variable
Change cpu_sys_devices from array to per_cpu variable in drivers/base/cpu.c.
Signed-off-by: Mike Travis <travis@sgi.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/base/cpu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 6fe417429977..e38dfed41d80 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c | |||
@@ -18,7 +18,7 @@ struct sysdev_class cpu_sysdev_class = { | |||
18 | }; | 18 | }; |
19 | EXPORT_SYMBOL(cpu_sysdev_class); | 19 | EXPORT_SYMBOL(cpu_sysdev_class); |
20 | 20 | ||
21 | static struct sys_device *cpu_sys_devices[NR_CPUS]; | 21 | static DEFINE_PER_CPU(struct sys_device *, cpu_sys_devices); |
22 | 22 | ||
23 | #ifdef CONFIG_HOTPLUG_CPU | 23 | #ifdef CONFIG_HOTPLUG_CPU |
24 | static ssize_t show_online(struct sys_device *dev, char *buf) | 24 | static ssize_t show_online(struct sys_device *dev, char *buf) |
@@ -68,7 +68,7 @@ void unregister_cpu(struct cpu *cpu) | |||
68 | sysdev_remove_file(&cpu->sysdev, &attr_online); | 68 | sysdev_remove_file(&cpu->sysdev, &attr_online); |
69 | 69 | ||
70 | sysdev_unregister(&cpu->sysdev); | 70 | sysdev_unregister(&cpu->sysdev); |
71 | cpu_sys_devices[logical_cpu] = NULL; | 71 | per_cpu(cpu_sys_devices, logical_cpu) = NULL; |
72 | return; | 72 | return; |
73 | } | 73 | } |
74 | #else /* ... !CONFIG_HOTPLUG_CPU */ | 74 | #else /* ... !CONFIG_HOTPLUG_CPU */ |
@@ -167,7 +167,7 @@ int __cpuinit register_cpu(struct cpu *cpu, int num) | |||
167 | if (!error && cpu->hotpluggable) | 167 | if (!error && cpu->hotpluggable) |
168 | register_cpu_control(cpu); | 168 | register_cpu_control(cpu); |
169 | if (!error) | 169 | if (!error) |
170 | cpu_sys_devices[num] = &cpu->sysdev; | 170 | per_cpu(cpu_sys_devices, num) = &cpu->sysdev; |
171 | if (!error) | 171 | if (!error) |
172 | register_cpu_under_node(num, cpu_to_node(num)); | 172 | register_cpu_under_node(num, cpu_to_node(num)); |
173 | 173 | ||
@@ -180,8 +180,8 @@ int __cpuinit register_cpu(struct cpu *cpu, int num) | |||
180 | 180 | ||
181 | struct sys_device *get_cpu_sysdev(unsigned cpu) | 181 | struct sys_device *get_cpu_sysdev(unsigned cpu) |
182 | { | 182 | { |
183 | if (cpu < NR_CPUS) | 183 | if (cpu < nr_cpu_ids && cpu_possible(cpu)) |
184 | return cpu_sys_devices[cpu]; | 184 | return per_cpu(cpu_sys_devices, cpu); |
185 | else | 185 | else |
186 | return NULL; | 186 | return NULL; |
187 | } | 187 | } |