diff options
| author | Daniel Hellstrom | 2011-04-20 01:41:23 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-04-22 00:31:30 +0200 |
| commit | 2cf9530420e446bb61f665d02afeb81070106900 (patch) | |
| tree | 157ee818554017ed8495a0556d30d38e662d2be9 /arch/sparc/include/asm/leon.h | |
| parent | sparc32,leon: add support for extended interrupt controller (diff) | |
| download | kernel-qcow2-linux-2cf9530420e446bb61f665d02afeb81070106900.tar.gz kernel-qcow2-linux-2cf9530420e446bb61f665d02afeb81070106900.tar.xz kernel-qcow2-linux-2cf9530420e446bb61f665d02afeb81070106900.zip | |
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) #ifdef CONFIG_SMP # define LEON3_IRQ_RESCHEDULE 13 -# define LEON3_IRQ_TICKER (leon_percpu_timer_dev[0].irq) +# define LEON3_IRQ_TICKER (leon3_ticker_irq) # define LEON3_IRQ_CROSS_CALL 15 #endif @@ -357,6 +357,7 @@ extern void leon3_getCacheRegs(struct leon3_cacheregs *regs); extern int leon_flush_needed(void); extern void leon_switch_mm(void); extern int srmmu_swprobe_trace; +extern int leon3_ticker_irq; #ifdef CONFIG_SMP extern int leon_smp_nrcpus(void); @@ -371,8 +372,9 @@ extern void init_IRQ(void); extern void cpu_panic(void); extern int __leon_processor_id(void); void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu); +extern irqreturn_t leon_percpu_timer_interrupt(int irq, void *unused); -extern unsigned int real_irq_entry[], smpleon_ticker[]; +extern unsigned int real_irq_entry[]; extern unsigned int patchme_maybe_smp_msg[]; extern unsigned int t_nmi[], linux_trap_ipi15_leon[]; extern unsigned int linux_trap_ipi15_sun4m[]; |