s390/cpu hotplug: mask out CPU_TASKS_FROZEN in cu hotplug notifiers

Unify all our cpu hotplug notifiers to mask out the CPU_TASKS_FROZEN
bit, so we don't have to add all the *_FROZEN variant cases to the
notifiers.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 823c5bfecfeafc555ad25098622c1a00f36932b8..87be1024d91b7eb31defdaa235b90cb7f90a6908 100644 (file)
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -959,13 +959,11 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,
        struct device *s = &c->dev;
        int err = 0;
 
-       switch (action) {
+       switch (action & ~CPU_TASKS_FROZEN) {
        case CPU_ONLINE:
-       case CPU_ONLINE_FROZEN:
                err = sysfs_create_group(&s->kobj, &cpu_online_attr_group);
                break;
        case CPU_DEAD:
-       case CPU_DEAD_FROZEN:
                sysfs_remove_group(&s->kobj, &cpu_online_attr_group);
                break;
        }

diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 4fc97b40a6e1a3fe48a9ca108cf0227e1fa637b9..d100c92cfcf824c434e419ee0d37ab640b810831 100644 (file)
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -378,9 +378,8 @@ static int __cpuinit s390_nohz_notify(struct notifier_block *self,
        long cpu = (long) hcpu;
 
        idle = &per_cpu(s390_idle, cpu);
-       switch (action) {
+       switch (action & ~CPU_TASKS_FROZEN) {
        case CPU_DYING:
-       case CPU_DYING_FROZEN:
                idle->nohz_delay = 0;
        default:
                break;

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 6c013f544146d8bf92d6143378c8f1fbf5631b02..12c887bcdf1f7d9dc8fabf27f04ec630dd1adc51 100644 (file)
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -628,9 +628,8 @@ static int __cpuinit pfault_cpu_notify(struct notifier_block *self,
        struct thread_struct *thread, *next;
        struct task_struct *tsk;
 
-       switch (action) {
+       switch (action & ~CPU_TASKS_FROZEN) {
        case CPU_DEAD:
-       case CPU_DEAD_FROZEN:
                spin_lock_irq(&pfault_lock);
                list_for_each_entry_safe(thread, next, &pfault_list, list) {
                        thread->pfault_wait = 0;