lkml.org 
[lkml]   [2010]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/3] sparc32: fix build failure on CONFIG_SPARC_LEON
    Date
      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>
    ---
    arch/sparc/kernel/irq_32.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c
    index 0116d8d..5ad6e5c 100644
    --- a/arch/sparc/kernel/irq_32.c
    +++ b/arch/sparc/kernel/irq_32.c
    @@ -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)
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2010-10-25 17:55    [W:0.028 / U:60.820 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site