diff options
author | Daniel Hellstrom <daniel@gaisler.com> | 2011-04-19 19:41:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-21 18:31:30 -0400 |
commit | 2cf9530420e446bb61f665d02afeb81070106900 (patch) | |
tree | 157ee818554017ed8495a0556d30d38e662d2be9 /arch/sparc/include/asm/leon.h | |
parent | 4c6773c3954cb1192f70a63e2dc61adc55bb0948 (diff) |
sparc32,leon: per-cpu ticker use genirq per-cpu handler
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/leon.h')
-rw-r--r-- | arch/sparc/include/asm/leon.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h index 12712541e9ee..204dc0f0243f 100644 --- a/arch/sparc/include/asm/leon.h +++ b/arch/sparc/include/asm/leon.h | |||
@@ -239,7 +239,7 @@ static inline int sparc_leon3_cpuid(void) | |||
239 | 239 | ||
240 | #ifdef CONFIG_SMP | 240 | #ifdef CONFIG_SMP |
241 | # define LEON3_IRQ_RESCHEDULE 13 | 241 | # define LEON3_IRQ_RESCHEDULE 13 |
242 | # define LEON3_IRQ_TICKER (leon_percpu_timer_dev[0].irq) | 242 | # define LEON3_IRQ_TICKER (leon3_ticker_irq) |
243 | # define LEON3_IRQ_CROSS_CALL 15 | 243 | # define LEON3_IRQ_CROSS_CALL 15 |
244 | #endif | 244 | #endif |
245 | 245 | ||
@@ -357,6 +357,7 @@ extern void leon3_getCacheRegs(struct leon3_cacheregs *regs); | |||
357 | extern int leon_flush_needed(void); | 357 | extern int leon_flush_needed(void); |
358 | extern void leon_switch_mm(void); | 358 | extern void leon_switch_mm(void); |
359 | extern int srmmu_swprobe_trace; | 359 | extern int srmmu_swprobe_trace; |
360 | extern int leon3_ticker_irq; | ||
360 | 361 | ||
361 | #ifdef CONFIG_SMP | 362 | #ifdef CONFIG_SMP |
362 | extern int leon_smp_nrcpus(void); | 363 | extern int leon_smp_nrcpus(void); |
@@ -371,8 +372,9 @@ extern void init_IRQ(void); | |||
371 | extern void cpu_panic(void); | 372 | extern void cpu_panic(void); |
372 | extern int __leon_processor_id(void); | 373 | extern int __leon_processor_id(void); |
373 | void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu); | 374 | void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu); |
375 | extern irqreturn_t leon_percpu_timer_interrupt(int irq, void *unused); | ||
374 | 376 | ||
375 | extern unsigned int real_irq_entry[], smpleon_ticker[]; | 377 | extern unsigned int real_irq_entry[]; |
376 | extern unsigned int patchme_maybe_smp_msg[]; | 378 | extern unsigned int patchme_maybe_smp_msg[]; |
377 | extern unsigned int t_nmi[], linux_trap_ipi15_leon[]; | 379 | extern unsigned int t_nmi[], linux_trap_ipi15_leon[]; |
378 | extern unsigned int linux_trap_ipi15_sun4m[]; | 380 | extern unsigned int linux_trap_ipi15_sun4m[]; |