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

Commit e18eb2d1 authored by Anna-Maria Gleixner's avatar Anna-Maria Gleixner Committed by Martin Schwidefsky
Browse files

s390/cpum_sf: Remove superfluous SMP function call 



Since commit 3b9d6da6 ("cpu/hotplug: Fix rollback during error-out
in __cpu_disable()") it is ensured that callbacks of CPU_ONLINE and
CPU_DOWN_PREPARE are processed on the hotplugged CPU. Due to this SMP
function calls are no longer required.

Replace smp_call_function_single() with a direct call of
setup_pmc_cpu(). To keep the calling convention, interrupts are
explicitly disabled around the call.

Cc: linux-s390@vger.kernel.org
Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 5bc73539

arch/s390/kernel/perf_cpum_sf.c

+6 −3
Original line number Diff line number Diff line
@@ -1510,7 +1510,6 @@ static void cpumf_measurement_alert(struct ext_code ext_code, 
static int cpumf_pmu_notifier(struct notifier_block *self,

			      unsigned long action, void *hcpu)

{

	unsigned int cpu = (long) hcpu;

	int flags;



	/* Ignore the notification if no events are scheduled on the PMU.
@@ -1523,11 +1522,15 @@ static int cpumf_pmu_notifier(struct notifier_block *self, 
	case CPU_ONLINE:

	case CPU_DOWN_FAILED:

		flags = PMC_INIT;

		smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1);

		local_irq_disable();

		setup_pmc_cpu(&flags);

		local_irq_enable();

		break;

	case CPU_DOWN_PREPARE:

		flags = PMC_RELEASE;

		smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1);

		local_irq_disable();

		setup_pmc_cpu(&flags);

		local_irq_enable();

		break;

	default:

		break;