p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s390/cpum_cf: Remove superfluous SMP function call 

Since commit 3b9d6da67e ("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: Anna-Maria Gleixner <anna-maria@linutronix.de>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Anna-Maria Gleixner 2016-05-02 10:59:32 +02:00 committed by Martin Schwidefsky
parent 7072276e6c
commit 5bc7353901
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/s390/kernel/perf_cpum_cf.c
View File

@ -665,18 +665,21 @@ static struct pmu cpumf_pmu = {
static int cpumf_pmu_notifier(struct notifier_block *self, unsigned long action, static int cpumf_pmu_notifier(struct notifier_block *self, unsigned long action,
void *hcpu) void *hcpu)
{ {
unsigned int cpu = (long) hcpu;
int flags; int flags;
switch (action & ~CPU_TASKS_FROZEN) { switch (action & ~CPU_TASKS_FROZEN) {
case CPU_ONLINE: case CPU_ONLINE:
case CPU_DOWN_FAILED: case CPU_DOWN_FAILED:
flags = PMC_INIT; flags = PMC_INIT;
smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1); local_irq_disable();
setup_pmc_cpu(&flags);
local_irq_enable();
break; break;
case CPU_DOWN_PREPARE: case CPU_DOWN_PREPARE:
flags = PMC_RELEASE; flags = PMC_RELEASE;
smp_call_function_single(cpu, setup_pmc_cpu, &flags, 1); local_irq_disable();
setup_pmc_cpu(&flags);
local_irq_enable();
break; break;
default: default:
break; break;