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 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
perf_event.c
diff --git
a/arch/sh/kernel/perf_event.c
b/arch/sh/kernel/perf_event.c
index
9f253e9
..
81b6de4
100644
(file)
--- a/
arch/sh/kernel/perf_event.c
+++ b/
arch/sh/kernel/perf_event.c
@@
-315,7
+315,7
@@
void hw_perf_disable(void)
sh_pmu->disable_all();
}
-int register_sh_pmu(struct sh_pmu *pmu)
+int
__cpuinit
register_sh_pmu(struct sh_pmu *pmu)
{
if (sh_pmu)
return -EBUSY;