git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
powerpc
/
kernel
/
pmc.c
diff --git
a/arch/powerpc/kernel/pmc.c
b/arch/powerpc/kernel/pmc.c
index
e6fb194
..
3d8f6f4
100644
(file)
--- a/
arch/powerpc/kernel/pmc.c
+++ b/
arch/powerpc/kernel/pmc.c
@@
-12,7
+12,6
@@
* 2 of the License, or (at your option) any later version.
*/
* 2 of the License, or (at your option) any later version.
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/spinlock.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/spinlock.h>
#include <linux/module.h>
@@
-72,7
+71,7
@@
int reserve_pmc_hardware(perf_irq_t new_perf_irq)
}
pmc_owner_caller = __builtin_return_address(0);
}
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);
out:
spin_unlock(&pmc_owner_lock);