diff options
| author | Will Deacon | 2019-07-29 12:43:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-08-06 19:06:55 +0200 |
| commit | c385cda0e70a565f7b3d93e2f665ea7b691ec937 (patch) | |
| tree | 137f6e111eb3c23a34e593e3088ba55f8b25dd2a /drivers/perf/arm_pmu.c | |
| parent | parisc: Fix build of compressed kernel even with debug enabled (diff) | |
| download | kernel-qcow2-linux-c385cda0e70a565f7b3d93e2f665ea7b691ec937.tar.gz kernel-qcow2-linux-c385cda0e70a565f7b3d93e2f665ea7b691ec937.tar.xz kernel-qcow2-linux-c385cda0e70a565f7b3d93e2f665ea7b691ec937.zip | |
drivers/perf: arm_pmu: Fix failure path in PM notifier
commit 0d7fd70f26039bd4b33444ca47f0e69ce3ae0354 upstream.
Handling of the CPU_PM_ENTER_FAILED transition in the Arm PMU PM
notifier code incorrectly skips restoration of the counters. Fix the
logic so that CPU_PM_ENTER_FAILED follows the same path as CPU_PM_EXIT.
Cc: <stable@vger.kernel.org>
Fixes: da4e4f18afe0f372 ("drivers/perf: arm_pmu: implement CPU_PM notifier")
Reported-by: Anders Roxell <anders.roxell@linaro.org>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/perf/arm_pmu.c')
| -rw-r--r-- | drivers/perf/arm_pmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index d0b7dd8fb184..77995df7fe54 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -730,8 +730,8 @@ static int cpu_pm_pmu_notify(struct notifier_block *b, unsigned long cmd, cpu_pm_pmu_setup(armpmu, cmd); break; case CPU_PM_EXIT: - cpu_pm_pmu_setup(armpmu, cmd); case CPU_PM_ENTER_FAILED: + cpu_pm_pmu_setup(armpmu, cmd); armpmu->start(armpmu); break; default: |