projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
65175c0
)
perf, sh: Fix patch merge foul-up
author
Matt Fleming
<matt@console-pimps.org>
Mon, 13 Sep 2010 19:17:29 +0000
(20:17 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 15 Sep 2010 08:43:59 +0000
(10:43 +0200)
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>
arch/sh/kernel/perf_event.c
patch
|
blob
|
history
diff --git
a/arch/sh/kernel/perf_event.c
b/arch/sh/kernel/perf_event.c
index
cf39c48
..
036f7a9
100644
(file)
--- a/
arch/sh/kernel/perf_event.c
+++ b/
arch/sh/kernel/perf_event.c
@@
-338,7
+338,7
@@
static struct pmu pmu = {
};
static void sh_pmu_setup(int cpu)
-
+{
struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu);
memset(cpuhw, 0, sizeof(struct cpu_hw_events));