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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
tick14.c
diff --git
a/arch/sparc/kernel/tick14.c
b/arch/sparc/kernel/tick14.c
index
591547a
..
707bfda
100644
(file)
--- a/
arch/sparc/kernel/tick14.c
+++ b/
arch/sparc/kernel/tick14.c
@@
-25,6
+25,8
@@
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/io.h>
+#include "irq.h"
+
extern unsigned long lvl14_save[5];
static unsigned long *linux_lvl14 = NULL;
static unsigned long obp_lvl14[4];
extern unsigned long lvl14_save[5];
static unsigned long *linux_lvl14 = NULL;
static unsigned long obp_lvl14[4];
@@
-55,14
+57,14
@@
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();
/* first we copy the obp handler instructions
*/
int irq_nr, unsigned int timeout )
{
int cpu = smp_processor_id();
/* first we copy the obp handler instructions
*/
- disable_irq(irq_nr);
+
__
disable_irq(irq_nr);
if (!handler)
return;
if (!handler)
return;
@@
-74,11
+76,11
@@
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();
load_profile_irq(cpu, timeout);
"counter14",
NULL)) {
install_linux_ticker();
load_profile_irq(cpu, timeout);
- enable_irq(irq_nr);
+
__
enable_irq(irq_nr);
}
}
}
}