Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10e1e99e authored by Guan Xuetao's avatar Guan Xuetao
Browse files

UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between... 


UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler

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: default avatarGuan Xuetao <gxt@mprc.pku.edu.cn>
parent 195d4577

arch/unicore32/include/asm/bug.h

+0 −5
Original line number Diff line number Diff line
@@ -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__ */

arch/unicore32/kernel/setup.h

+6 −0
Original line number Diff line number Diff line
@@ -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