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
/
sparc
/
kernel
/
tick14.c
diff --git
a/arch/sparc/kernel/tick14.c
b/arch/sparc/kernel/tick14.c
index
591547a
..
f1a7bd1
100644
(file)
--- a/
arch/sparc/kernel/tick14.c
+++ b/
arch/sparc/kernel/tick14.c
@@
-55,7
+55,7
@@
void install_obp_ticker(void)
linux_lvl14[3] = obp_lvl14[3];
}
linux_lvl14[3] = obp_lvl14[3];
}
-void claim_ticker14(irq
return_t (*handler)(int, void *, struct pt_regs *)
,
+void claim_ticker14(irq
_handler_t handler
,
int irq_nr, unsigned int timeout )
{
int cpu = smp_processor_id();
int irq_nr, unsigned int timeout )
{
int cpu = smp_processor_id();
@@
-74,7
+74,7
@@
void claim_ticker14(irqreturn_t (*handler)(int, void *, struct pt_regs *),
if (!request_irq(irq_nr,
handler,
if (!request_irq(irq_nr,
handler,
- (
SA_INTERRUPT
| SA_STATIC_ALLOC),
+ (
IRQF_DISABLED
| SA_STATIC_ALLOC),
"counter14",
NULL)) {
install_linux_ticker();
"counter14",
NULL)) {
install_linux_ticker();