Commit e12570c9 authored by Sven Schnelle's avatar Sven Schnelle Committed by Alexander Gordeev
Browse files

s390/smp: Use monotonic clock in smp_emergency_stop() 



This is a cosmetic change because when in smp_emergency_stop()
the system is going to die anyway. But still change the code
to use get_tod_clock_monotonic() to prevent people from copying
broken code.

Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 09e7e29d

arch/s390/kernel/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -430,16 +430,16 @@ void notrace smp_emergency_stop(void) 
	cpumask_copy(&cpumask, cpu_online_mask);

	cpumask_clear_cpu(smp_processor_id(), &cpumask);



	end = get_tod_clock() + (1000000UL << 12);

	end = get_tod_clock_monotonic() + (1000000UL << 12);

	for_each_cpu(cpu, &cpumask) {

		struct pcpu *pcpu = per_cpu_ptr(&pcpu_devices, cpu);

		set_bit(ec_stop_cpu, &pcpu->ec_mask);

		while (__pcpu_sigp(pcpu->address, SIGP_EMERGENCY_SIGNAL,

				   0, NULL) == SIGP_CC_BUSY &&

		       get_tod_clock() < end)

		       get_tod_clock_monotonic() < end)

			cpu_relax();

	}

	while (get_tod_clock() < end) {

	while (get_tod_clock_monotonic() < end) {

		for_each_cpu(cpu, &cpumask)

			if (pcpu_stopped(per_cpu_ptr(&pcpu_devices, cpu)))

				cpumask_clear_cpu(cpu, &cpumask);