diff options
Diffstat (limited to 'arch/sparc/kernel/tick14.c')
-rw-r--r-- | arch/sparc/kernel/tick14.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc/kernel/tick14.c b/arch/sparc/kernel/tick14.c index f1a7bd19e04f..707bfda86570 100644 --- a/arch/sparc/kernel/tick14.c +++ b/arch/sparc/kernel/tick14.c | |||
@@ -25,6 +25,8 @@ | |||
25 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
27 | 27 | ||
28 | #include "irq.h" | ||
29 | |||
28 | extern unsigned long lvl14_save[5]; | 30 | extern unsigned long lvl14_save[5]; |
29 | static unsigned long *linux_lvl14 = NULL; | 31 | static unsigned long *linux_lvl14 = NULL; |
30 | static unsigned long obp_lvl14[4]; | 32 | static unsigned long obp_lvl14[4]; |
@@ -62,7 +64,7 @@ void claim_ticker14(irq_handler_t handler, | |||
62 | 64 | ||
63 | /* first we copy the obp handler instructions | 65 | /* first we copy the obp handler instructions |
64 | */ | 66 | */ |
65 | disable_irq(irq_nr); | 67 | __disable_irq(irq_nr); |
66 | if (!handler) | 68 | if (!handler) |
67 | return; | 69 | return; |
68 | 70 | ||
@@ -79,6 +81,6 @@ void claim_ticker14(irq_handler_t handler, | |||
79 | NULL)) { | 81 | NULL)) { |
80 | install_linux_ticker(); | 82 | install_linux_ticker(); |
81 | load_profile_irq(cpu, timeout); | 83 | load_profile_irq(cpu, timeout); |
82 | enable_irq(irq_nr); | 84 | __enable_irq(irq_nr); |
83 | } | 85 | } |
84 | } | 86 | } |