diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2012-05-25 23:20:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-28 08:52:44 +0200 |
| commit | b08b5c9c9b35c938e8a94d9232e05a7f69a1dba5 (patch) | |
| tree | 8b2cf57dffad7549831c10be683de98a777e110a /arch/sparc | |
| parent | sparc32: add support for run-time patching of leon/sun single instructions (diff) | |
| download | linux-b08b5c9c9b35c938e8a94d9232e05a7f69a1dba5.tar.xz linux-b08b5c9c9b35c938e8a94d9232e05a7f69a1dba5.zip | |
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>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/irq_32.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c index ae04914f7774..c145f6fd123b 100644 --- a/arch/sparc/kernel/irq_32.c +++ b/arch/sparc/kernel/irq_32.c @@ -241,9 +241,6 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler) unsigned int cpu_irq; 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); 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; INSTANTIATE(sparc_ttable) -#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON - trap_table = &trapbase_cpu1; - INSTANTIATE(trap_table) - trap_table = &trapbase_cpu2; - INSTANTIATE(trap_table) - trap_table = &trapbase_cpu3; - INSTANTIATE(trap_table) + +#if defined CONFIG_SMP + if (sparc_cpu_model != sparc_leon) { + struct tt_entry *trap_table; + + trap_table = &trapbase_cpu1; + INSTANTIATE(trap_table) + trap_table = &trapbase_cpu2; + INSTANTIATE(trap_table) + trap_table = &trapbase_cpu3; + INSTANTIATE(trap_table) + } #endif #undef INSTANTIATE /* |