Commit d882ba69 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds

s390: convert cpu notifier to return encapsulate errno value

By the previous modification, the cpu notifier can return encapsulate
errno value.  This converts the cpu notifiers for s390.
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1dee31f7
...@@ -944,21 +944,21 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self, ...@@ -944,21 +944,21 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,
struct cpu *c = &per_cpu(cpu_devices, cpu); struct cpu *c = &per_cpu(cpu_devices, cpu);
struct sys_device *s = &c->sysdev; struct sys_device *s = &c->sysdev;
struct s390_idle_data *idle; struct s390_idle_data *idle;
int err = 0;
switch (action) { switch (action) {
case CPU_ONLINE: case CPU_ONLINE:
case CPU_ONLINE_FROZEN: case CPU_ONLINE_FROZEN:
idle = &per_cpu(s390_idle, cpu); idle = &per_cpu(s390_idle, cpu);
memset(idle, 0, sizeof(struct s390_idle_data)); memset(idle, 0, sizeof(struct s390_idle_data));
if (sysfs_create_group(&s->kobj, &cpu_online_attr_group)) err = sysfs_create_group(&s->kobj, &cpu_online_attr_group);
return NOTIFY_BAD;
break; break;
case CPU_DEAD: case CPU_DEAD:
case CPU_DEAD_FROZEN: case CPU_DEAD_FROZEN:
sysfs_remove_group(&s->kobj, &cpu_online_attr_group); sysfs_remove_group(&s->kobj, &cpu_online_attr_group);
break; break;
} }
return NOTIFY_OK; return notifier_from_errno(err);
} }
static struct notifier_block __cpuinitdata smp_cpu_nb = { static struct notifier_block __cpuinitdata smp_cpu_nb = {
......
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