git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
perf_event.c
diff --git
a/arch/arm/kernel/perf_event.c
b/arch/arm/kernel/perf_event.c
index
d53c0ab
..
2b5b142
100644
(file)
--- a/
arch/arm/kernel/perf_event.c
+++ b/
arch/arm/kernel/perf_event.c
@@
-583,7
+583,7
@@
static int armpmu_event_init(struct perf_event *event)
static void armpmu_enable(struct pmu *pmu)
{
/* Enable all of the perf events on hardware. */
static void armpmu_enable(struct pmu *pmu)
{
/* Enable all of the perf events on hardware. */
- int idx;
+ int idx
, enabled = 0
;
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
if (!armpmu)
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
if (!armpmu)
@@
-596,9
+596,11
@@
static void armpmu_enable(struct pmu *pmu)
continue;
armpmu->enable(&event->hw, idx);
continue;
armpmu->enable(&event->hw, idx);
+ enabled = 1;
}
}
- armpmu->start();
+ if (enabled)
+ armpmu->start();
}
static void armpmu_disable(struct pmu *pmu)
}
static void armpmu_disable(struct pmu *pmu)