.. | .. |
---|
14 | 14 | #include <linux/smp.h> |
---|
15 | 15 | #include <linux/spinlock.h> |
---|
16 | 16 | #include <linux/irq.h> |
---|
| 17 | +#include <linux/pgtable.h> |
---|
17 | 18 | |
---|
18 | 19 | #include <asm/irq_cpu.h> |
---|
19 | 20 | #include <asm/i8259.h> |
---|
20 | 21 | #include <asm/io.h> |
---|
21 | 22 | #include <asm/jazz.h> |
---|
22 | | -#include <asm/pgtable.h> |
---|
23 | 23 | #include <asm/tlbmisc.h> |
---|
24 | 24 | |
---|
25 | 25 | static DEFINE_RAW_SPINLOCK(r4030_lock); |
---|
.. | .. |
---|
125 | 125 | return IRQ_HANDLED; |
---|
126 | 126 | } |
---|
127 | 127 | |
---|
128 | | -static struct irqaction r4030_timer_irqaction = { |
---|
129 | | - .handler = r4030_timer_interrupt, |
---|
130 | | - .flags = IRQF_TIMER, |
---|
131 | | - .name = "R4030 timer", |
---|
132 | | -}; |
---|
133 | | - |
---|
134 | 128 | void __init plat_time_init(void) |
---|
135 | 129 | { |
---|
136 | 130 | struct clock_event_device *cd = &r4030_clockevent; |
---|
137 | | - struct irqaction *action = &r4030_timer_irqaction; |
---|
138 | 131 | unsigned int cpu = smp_processor_id(); |
---|
139 | 132 | |
---|
140 | 133 | BUG_ON(HZ != 100); |
---|
141 | 134 | |
---|
142 | 135 | cd->cpumask = cpumask_of(cpu); |
---|
143 | 136 | clockevents_register_device(cd); |
---|
144 | | - action->dev_id = cd; |
---|
145 | | - setup_irq(JAZZ_TIMER_IRQ, action); |
---|
| 137 | + if (request_irq(JAZZ_TIMER_IRQ, r4030_timer_interrupt, IRQF_TIMER, |
---|
| 138 | + "R4030 timer", cd)) |
---|
| 139 | + pr_err("Failed to register R4030 timer interrupt\n"); |
---|
146 | 140 | |
---|
147 | 141 | /* |
---|
148 | 142 | * Set clock to 100Hz. |
---|