mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-12 08:09:56 +00:00
sparc32: handle leon in irq_32.c
Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Daniel Hellstrom <daniel@gaisler.com> Cc: Konrad Eisele <konrad@gaisler.com>
This commit is contained in:
parent
5b8b93c4ab
commit
b08b5c9c9b
@ -241,9 +241,6 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler)
|
|||||||
unsigned int cpu_irq;
|
unsigned int cpu_irq;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON
|
|
||||||
struct tt_entry *trap_table;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
err = request_irq(irq, irq_handler, 0, "floppy", NULL);
|
err = request_irq(irq, irq_handler, 0, "floppy", NULL);
|
||||||
if (err)
|
if (err)
|
||||||
@ -264,13 +261,18 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler)
|
|||||||
table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP;
|
table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP;
|
||||||
|
|
||||||
INSTANTIATE(sparc_ttable)
|
INSTANTIATE(sparc_ttable)
|
||||||
#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON
|
|
||||||
trap_table = &trapbase_cpu1;
|
#if defined CONFIG_SMP
|
||||||
INSTANTIATE(trap_table)
|
if (sparc_cpu_model != sparc_leon) {
|
||||||
trap_table = &trapbase_cpu2;
|
struct tt_entry *trap_table;
|
||||||
INSTANTIATE(trap_table)
|
|
||||||
trap_table = &trapbase_cpu3;
|
trap_table = &trapbase_cpu1;
|
||||||
INSTANTIATE(trap_table)
|
INSTANTIATE(trap_table)
|
||||||
|
trap_table = &trapbase_cpu2;
|
||||||
|
INSTANTIATE(trap_table)
|
||||||
|
trap_table = &trapbase_cpu3;
|
||||||
|
INSTANTIATE(trap_table)
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#undef INSTANTIATE
|
#undef INSTANTIATE
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user