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 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
[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
3129c85
..
5674807
100644
(file)
--- a/
arch/powerpc/kernel/perf_event.c
+++ b/
arch/powerpc/kernel/perf_event.c
@@
-1379,7
+1379,7
@@
int register_power_pmu(struct power_pmu *pmu)
freeze_events_kernel = MMCR0_FCHV;
#endif /* CONFIG_PPC64 */
- perf_pmu_register(&power_pmu);
+ perf_pmu_register(&power_pmu
, "cpu", PERF_TYPE_RAW
);
perf_cpu_notifier(power_pmu_notifier);
return 0;