From ac0874b980596346afaf87baa76c714fb7654afa Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Mon, 18 May 2009 14:02:12 +1000 Subject: [PATCH] --- yaml --- r: 147473 b: refs/heads/master c: c0daaf3f1f672defa3a45ca449b76d0e86c55892 h: refs/heads/master i: 147471: 8a612005bac63b448426f15ca5ecb9988c7e3423 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/perf_counter.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 310b09492e6b..bb709bc021b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc3f81b129b5439ba7bac265bbc6a51a39275dae +refs/heads/master: c0daaf3f1f672defa3a45ca449b76d0e86c55892 diff --git a/trunk/arch/powerpc/kernel/perf_counter.c b/trunk/arch/powerpc/kernel/perf_counter.c index 6baae5a5c331..fe21b2440f28 100644 --- a/trunk/arch/powerpc/kernel/perf_counter.c +++ b/trunk/arch/powerpc/kernel/perf_counter.c @@ -450,12 +450,11 @@ void hw_perf_enable(void) int idx; local_irq_save(flags); + cpuhw = &__get_cpu_var(cpu_hw_counters); if (!cpuhw->disabled) { local_irq_restore(flags); return; } - - cpuhw = &__get_cpu_var(cpu_hw_counters); cpuhw->disabled = 0; /*