diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-10-28 14:52:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-10-28 14:52:30 +0100 |
| commit | 7c5b3fc20807279d8f8e78f1e2ef275128668796 (patch) | |
| tree | 393e609ef9e6cd32c9fbce258686a462b33b4ce8 /arch/arm | |
| parent | b5893c56ca7e664aef010a71c2638db768d4e996 (diff) | |
| download | op-kernel-dev-7c5b3fc20807279d8f8e78f1e2ef275128668796.zip op-kernel-dev-7c5b3fc20807279d8f8e78f1e2ef275128668796.tar.gz | |
[ARM] 2/4 Fix oprofile suspend/resume
The oprofile suspend/resume was missing locking. If we failed
to start oprofile on resume, we still reported that it was
enabled. Instead, disable oprofile on error.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/oprofile/common.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c index 5b1d752..02e5d6f 100644 --- a/arch/arm/oprofile/common.c +++ b/arch/arm/oprofile/common.c @@ -78,15 +78,19 @@ static void pmu_stop(void) #ifdef CONFIG_PM static int pmu_suspend(struct sys_device *dev, pm_message_t state) { + down(&pmu_sem); if (pmu_enabled) - pmu_stop(); + pmu_model->stop(); + up(&pmu_sem); return 0; } static int pmu_resume(struct sys_device *dev) { - if (pmu_enabled) - pmu_start(); + down(&pmu_sem); + if (pmu_enabled && pmu_model->start()) + pmu_enabled = 0; + up(&pmu_sem); return 0; } |
