projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cell-merge' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6
[powerpc.git]
/
arch
/
powerpc
/
kernel
/
pmc.c
diff --git
a/arch/powerpc/kernel/pmc.c
b/arch/powerpc/kernel/pmc.c
index
a0a2efa
..
3d8f6f4
100644
(file)
--- a/
arch/powerpc/kernel/pmc.c
+++ b/
arch/powerpc/kernel/pmc.c
@@
-71,7
+71,7
@@
int reserve_pmc_hardware(perf_irq_t new_perf_irq)
}
pmc_owner_caller = __builtin_return_address(0);
- perf_irq = new_perf_irq ? : dummy_perf;
+ perf_irq = new_perf_irq ?
new_perf_irq
: dummy_perf;
out:
spin_unlock(&pmc_owner_lock);