From 681964fbea28569278a390afbf5c62013d25d9a7 Mon Sep 17 00:00:00 2001 From: Guan Xuetao Date: Thu, 14 Jun 2012 11:38:25 +0800 Subject: [PATCH] --- yaml --- r: 335663 b: refs/heads/master c: 10e1e99e55378a65529c48753703c069aebce7af h: refs/heads/master i: 335661: d32124f7f0c2befb7b01246a295c1f517614ac49 335659: 2d48d4bd6fd100fc273b4a6f539404e53cb7fb9c 335655: 2046f3a20d6e73683f6cbff6f42da5e329738cc2 335647: f357351bf12ca13d11caae088ae8d50c4c4a5ad5 v: v3 --- [refs] | 2 +- trunk/arch/unicore32/include/asm/bug.h | 5 ----- trunk/arch/unicore32/kernel/setup.h | 6 ++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bb5962a9feda..bf4671a52e3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 195d4577d1d7ab1f0398b3190547c116b56f435f +refs/heads/master: 10e1e99e55378a65529c48753703c069aebce7af diff --git a/trunk/arch/unicore32/include/asm/bug.h b/trunk/arch/unicore32/include/asm/bug.h index b1ff8cadb086..93a56f3e2344 100644 --- a/trunk/arch/unicore32/include/asm/bug.h +++ b/trunk/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/trunk/arch/unicore32/kernel/setup.h b/trunk/arch/unicore32/kernel/setup.h index f23955028a18..30f749da8f73 100644 --- a/trunk/arch/unicore32/kernel/setup.h +++ b/trunk/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