diff options
Diffstat (limited to 'drivers/base/cpu.c')
| -rw-r--r-- | drivers/base/cpu.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index e38dfed41d80..20537d507909 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c | |||
| @@ -21,15 +21,16 @@ EXPORT_SYMBOL(cpu_sysdev_class); | |||
| 21 | static DEFINE_PER_CPU(struct sys_device *, cpu_sys_devices); | 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, struct sysdev_attribute *attr, |
| 25 | char *buf) | ||
| 25 | { | 26 | { |
| 26 | struct cpu *cpu = container_of(dev, struct cpu, sysdev); | 27 | struct cpu *cpu = container_of(dev, struct cpu, sysdev); |
| 27 | 28 | ||
| 28 | return sprintf(buf, "%u\n", !!cpu_online(cpu->sysdev.id)); | 29 | return sprintf(buf, "%u\n", !!cpu_online(cpu->sysdev.id)); |
| 29 | } | 30 | } |
| 30 | 31 | ||
| 31 | static ssize_t __ref store_online(struct sys_device *dev, const char *buf, | 32 | static ssize_t __ref store_online(struct sys_device *dev, struct sysdev_attribute *attr, |
| 32 | size_t count) | 33 | const char *buf, size_t count) |
| 33 | { | 34 | { |
| 34 | struct cpu *cpu = container_of(dev, struct cpu, sysdev); | 35 | struct cpu *cpu = container_of(dev, struct cpu, sysdev); |
| 35 | ssize_t ret; | 36 | ssize_t ret; |
| @@ -80,7 +81,8 @@ static inline void register_cpu_control(struct cpu *cpu) | |||
| 80 | #ifdef CONFIG_KEXEC | 81 | #ifdef CONFIG_KEXEC |
| 81 | #include <linux/kexec.h> | 82 | #include <linux/kexec.h> |
| 82 | 83 | ||
| 83 | static ssize_t show_crash_notes(struct sys_device *dev, char *buf) | 84 | static ssize_t show_crash_notes(struct sys_device *dev, struct sysdev_attribute *attr, |
| 85 | char *buf) | ||
| 84 | { | 86 | { |
| 85 | struct cpu *cpu = container_of(dev, struct cpu, sysdev); | 87 | struct cpu *cpu = container_of(dev, struct cpu, sysdev); |
| 86 | ssize_t rc; | 88 | ssize_t rc; |
