Merge tag 'v4.16-rc6' into perf/core, to pick up fixes

[linux.git] / drivers / perf / arm_pmu.c

diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 344e2083e94128fbc695594347b4740e3b470a2c..1a0d340b65cf1d2b85d09a2d4e0857d7795ea112 100644 (file)
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -638,7 +638,7 @@ static int arm_perf_teardown_cpu(unsigned int cpu, struct hlist_node *node)
                if (irq_is_percpu_devid(irq))
                        disable_percpu_irq(irq);
                else
-                       disable_irq(irq);
+                       disable_irq_nosync(irq);
        }
 
        per_cpu(cpu_armpmu, cpu) = NULL;