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

Commit 84c9ceef authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

s390/mm/pfault: Convert to hotplug state machine 



Install the callbacks via the state machine.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: linux-s390@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: rt@linutronix.de
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Link: http://lkml.kernel.org/r/20160906170457.32393-18-bigeasy@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e476d312

arch/s390/mm/fault.c

+12 −18
Original line number Diff line number Diff line
@@ -740,14 +740,11 @@ static void pfault_interrupt(struct ext_code ext_code, 
	put_task_struct(tsk);

}



static int pfault_cpu_notify(struct notifier_block *self, unsigned long action,

			     void *hcpu)

static int pfault_cpu_dead(unsigned int cpu)

{

	struct thread_struct *thread, *next;

	struct task_struct *tsk;



	switch (action & ~CPU_TASKS_FROZEN) {

	case CPU_DEAD:

	spin_lock_irq(&pfault_lock);

	list_for_each_entry_safe(thread, next, &pfault_list, list) {

		thread->pfault_wait = 0;
@@ -757,11 +754,7 @@ static int pfault_cpu_notify(struct notifier_block *self, unsigned long action, 
		put_task_struct(tsk);

	}

	spin_unlock_irq(&pfault_lock);

		break;

	default:

		break;

	}

	return NOTIFY_OK;

	return 0;

}



static int __init pfault_irq_init(void)
@@ -775,7 +768,8 @@ static int __init pfault_irq_init(void) 
	if (rc)

		goto out_pfault;

	irq_subclass_register(IRQ_SUBCLASS_SERVICE_SIGNAL);

	hotcpu_notifier(pfault_cpu_notify, 0);

	cpuhp_setup_state_nocalls(CPUHP_S390_PFAULT_DEAD, "s390/pfault:dead",

				  NULL, pfault_cpu_dead);

	return 0;



out_pfault:

include/linux/cpuhotplug.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ enum cpuhp_state { 
	CPUHP_BLOCK_SOFTIRQ_DEAD,

	CPUHP_VIRT_SCSI_DEAD,

	CPUHP_ACPI_CPUDRV_DEAD,

	CPUHP_S390_PFAULT_DEAD,

	CPUHP_WORKQUEUE_PREP,

	CPUHP_POWER_NUMA_PREPARE,

	CPUHP_HRTIMERS_PREPARE,