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 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
perf_event.c
diff --git
a/arch/powerpc/kernel/perf_event.c
b/arch/powerpc/kernel/perf_event.c
index
14967de
..
10a140f
100644
(file)
--- a/
arch/powerpc/kernel/perf_event.c
+++ b/
arch/powerpc/kernel/perf_event.c
@@
-1408,7
+1408,7
@@
power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu
return NOTIFY_OK;
}
-int register_power_pmu(struct power_pmu *pmu)
+int
__cpuinit
register_power_pmu(struct power_pmu *pmu)
{
if (ppmu)
return -EBUSY; /* something's already registered */