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 branches 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git...
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
perf_event.c
diff --git
a/arch/arm/kernel/perf_event.c
b/arch/arm/kernel/perf_event.c
index
8e9c98e
..
88b0941
100644
(file)
--- a/
arch/arm/kernel/perf_event.c
+++ b/
arch/arm/kernel/perf_event.c
@@
-640,6
+640,9
@@
static struct platform_device_id armpmu_plat_device_ids[] = {
static int __devinit armpmu_device_probe(struct platform_device *pdev)
{
+ if (!cpu_pmu)
+ return -ENODEV;
+
cpu_pmu->plat_device = pdev;
return 0;
}