lkml.org 
[lkml]   [2012]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler
    Date
    For kernel/bound.c being compiled by native compiler, it will generate following errors in gcc 4.4.3:
    CC kernel/bounds.s
    In file included from include/linux/bug.h:4,
    from include/linux/page-flags.h:9,
    from kernel/bounds.c:9:
    arch/unicore32/include/asm/bug.h:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
    arch/unicore32/include/asm/bug.h:23: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'

    So, we moved definitions in asm/bug.h to arch/unicore32/kernel/setup.h to solve the problem.

    Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
    ---
    arch/unicore32/include/asm/bug.h | 5 -----
    arch/unicore32/kernel/setup.h | 6 ++++++
    2 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/arch/unicore32/include/asm/bug.h b/arch/unicore32/include/asm/bug.h
    index b1ff8ca..93a56f3 100644
    --- a/arch/unicore32/include/asm/bug.h
    +++ b/arch/unicore32/include/asm/bug.h
    @@ -19,9 +19,4 @@ extern void die(const char *msg, struct pt_regs *regs, int err);
    extern void uc32_notify_die(const char *str, struct pt_regs *regs,
    struct siginfo *info, unsigned long err, unsigned long trap);

    -extern asmlinkage void __backtrace(void);
    -extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
    -
    -extern void __show_regs(struct pt_regs *);
    -
    #endif /* __UNICORE_BUG_H__ */
    diff --git a/arch/unicore32/kernel/setup.h b/arch/unicore32/kernel/setup.h
    index f239550..30f749d 100644
    --- a/arch/unicore32/kernel/setup.h
    +++ b/arch/unicore32/kernel/setup.h
    @@ -30,4 +30,10 @@ extern char __vectors_start[], __vectors_end[];
    extern void kernel_thread_helper(void);

    extern void __init early_signal_init(void);
    +
    +extern asmlinkage void __backtrace(void);
    +extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
    +
    +extern void __show_regs(struct pt_regs *);
    +
    #endif
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2012-06-14 12:01    [W:0.021 / U:32.716 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site