diff options
Diffstat (limited to 'drivers/base/cpu.c')
-rw-r--r-- | drivers/base/cpu.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 7036e8e96ab8..f35719aab3c1 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/topology.h> | 10 | #include <linux/topology.h> |
11 | #include <linux/device.h> | 11 | #include <linux/device.h> |
12 | #include <linux/node.h> | 12 | #include <linux/node.h> |
13 | #include <linux/gfp.h> | ||
13 | 14 | ||
14 | #include "base.h" | 15 | #include "base.h" |
15 | 16 | ||
@@ -79,24 +80,24 @@ void unregister_cpu(struct cpu *cpu) | |||
79 | } | 80 | } |
80 | 81 | ||
81 | #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE | 82 | #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE |
82 | static ssize_t cpu_probe_store(struct sys_device *dev, | 83 | static ssize_t cpu_probe_store(struct sysdev_class *class, |
83 | struct sysdev_attribute *attr, | 84 | struct sysdev_class_attribute *attr, |
84 | const char *buf, | 85 | const char *buf, |
85 | size_t count) | 86 | size_t count) |
86 | { | 87 | { |
87 | return arch_cpu_probe(buf, count); | 88 | return arch_cpu_probe(buf, count); |
88 | } | 89 | } |
89 | 90 | ||
90 | static ssize_t cpu_release_store(struct sys_device *dev, | 91 | static ssize_t cpu_release_store(struct sysdev_class *class, |
91 | struct sysdev_attribute *attr, | 92 | struct sysdev_class_attribute *attr, |
92 | const char *buf, | 93 | const char *buf, |
93 | size_t count) | 94 | size_t count) |
94 | { | 95 | { |
95 | return arch_cpu_release(buf, count); | 96 | return arch_cpu_release(buf, count); |
96 | } | 97 | } |
97 | 98 | ||
98 | static SYSDEV_ATTR(probe, S_IWUSR, NULL, cpu_probe_store); | 99 | static SYSDEV_CLASS_ATTR(probe, S_IWUSR, NULL, cpu_probe_store); |
99 | static SYSDEV_ATTR(release, S_IWUSR, NULL, cpu_release_store); | 100 | static SYSDEV_CLASS_ATTR(release, S_IWUSR, NULL, cpu_release_store); |
100 | #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ | 101 | #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ |
101 | 102 | ||
102 | #else /* ... !CONFIG_HOTPLUG_CPU */ | 103 | #else /* ... !CONFIG_HOTPLUG_CPU */ |