diff options
| author | Matt Fleming <matt@console-pimps.org> | 2010-09-13 15:17:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-15 04:43:59 -0400 |
| commit | 64a48d90149bb7007275fac13eaa4cb8d8ce12ea (patch) | |
| tree | fc7df25e2c2671f0dd996201faefdd6330d5b0f7 | |
| parent | 65175c07653534294257f75baa03a36edad86870 (diff) | |
perf, sh: Fix patch merge foul-up
3f6da390 ("perf: Rework and fix the arch CPU-hotplug hooks") introduced
this breakage. sh_pmu_setup() is missing an opening curly brace.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20100913191729.GA6440@console-pimps.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/sh/kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c index cf39c4873468..036f7a9296fa 100644 --- a/arch/sh/kernel/perf_event.c +++ b/arch/sh/kernel/perf_event.c | |||
| @@ -338,7 +338,7 @@ static struct pmu pmu = { | |||
| 338 | }; | 338 | }; |
| 339 | 339 | ||
| 340 | static void sh_pmu_setup(int cpu) | 340 | static void sh_pmu_setup(int cpu) |
| 341 | 341 | { | |
| 342 | struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu); | 342 | struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu); |
| 343 | 343 | ||
| 344 | memset(cpuhw, 0, sizeof(struct cpu_hw_events)); | 344 | memset(cpuhw, 0, sizeof(struct cpu_hw_events)); |
