mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
sparc32: fix build failure on CONFIG_SPARC_LEON
CC arch/sparc/kernel/irq_32.o arch/sparc/kernel/irq_32.c: In function 'request_fast_irq': arch/sparc/kernel/irq_32.c:370:25: error: conflicting types for 'trapbase_cpu1' arch/sparc/include/asm/leon.h:366:22: note: previous declaration of 'trapbase_cpu1' was here arch/sparc/kernel/irq_32.c:370:40: error: conflicting types for 'trapbase_cpu2' arch/sparc/include/asm/leon.h:367:22: note: previous declaration of 'trapbase_cpu2' was here arch/sparc/kernel/irq_32.c:370:55: error: conflicting types for 'trapbase_cpu3' arch/sparc/include/asm/leon.h:368:22: note: previous declaration of 'trapbase_cpu3' was here make[3]: *** [arch/sparc/kernel/irq_32.o] Error 1 make[2]: *** [arch/sparc/kernel] Error 2 make[1]: *** [sub-make] Error 2 make: *** [all] Error 2 Signed-off-by: Namhyung Kim <namhyung@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
502279a7cd
commit
516723215c
|
@ -365,7 +365,7 @@ static int request_fast_irq(unsigned int irq,
|
|||
unsigned long flags;
|
||||
unsigned int cpu_irq;
|
||||
int ret;
|
||||
#ifdef CONFIG_SMP
|
||||
#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON
|
||||
struct tt_entry *trap_table;
|
||||
extern struct tt_entry trapbase_cpu1, trapbase_cpu2, trapbase_cpu3;
|
||||
#endif
|
||||
|
@ -425,7 +425,7 @@ static int request_fast_irq(unsigned int irq,
|
|||
table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP;
|
||||
|
||||
INSTANTIATE(sparc_ttable)
|
||||
#ifdef CONFIG_SMP
|
||||
#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)
|
||||
|
|
Loading…
Reference in a new issue