Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c725922 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 0d0e471b

arch/s390/kernel/smp.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

	}

arch/s390/kernel/vtime.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

arch/s390/mm/fault.c

+1 −2
Original line number Diff line number Diff line
@@ -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;