xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable

Browse Source
This commit is contained in:
Russell King
2011-07-15 10:06:42 +01:00
parent cb5fd904f0 8f2ffa00fb
commit 4aa96ccf9e
436 changed files with 31057 additions and 3923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/kernel/perf_event.c
View File

@@ -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. */
int idx;
int idx, enabled = 0;
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);
enabled = 1;
}
armpmu->start();
if (enabled)
armpmu->start();
}
static void armpmu_disable(struct pmu *pmu)