Commit 4f60fdf6 authored by Alexander Nyberg's avatar Alexander Nyberg Committed by Linus Torvalds

[PATCH] x86_64: CONFIG_BUG=n fixes

Fixes some !CONFIG_BUG warnings:
include/asm/mmu_context.h: I funktion `switch_mm':
include/asm/mmu_context.h:57: varning: implicit declaration of function `out_of_line_bug'
Signed-off-by: default avatarAlexander Nyberg <alexn@telia.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dca79a04
...@@ -332,10 +332,12 @@ void handle_BUG(struct pt_regs *regs) ...@@ -332,10 +332,12 @@ void handle_BUG(struct pt_regs *regs)
printk(KERN_ALERT "Kernel BUG at %.50s:%d\n", f.filename, f.line); printk(KERN_ALERT "Kernel BUG at %.50s:%d\n", f.filename, f.line);
} }
#ifdef CONFIG_BUG
void out_of_line_bug(void) void out_of_line_bug(void)
{ {
BUG(); BUG();
} }
#endif
static DEFINE_SPINLOCK(die_lock); static DEFINE_SPINLOCK(die_lock);
static int die_owner = -1; static int die_owner = -1;
......
...@@ -193,8 +193,9 @@ EXPORT_SYMBOL(smp_num_siblings); ...@@ -193,8 +193,9 @@ EXPORT_SYMBOL(smp_num_siblings);
extern void do_softirq_thunk(void); extern void do_softirq_thunk(void);
EXPORT_SYMBOL(do_softirq_thunk); EXPORT_SYMBOL(do_softirq_thunk);
void out_of_line_bug(void); #ifdef CONFIG_BUG
EXPORT_SYMBOL(out_of_line_bug); EXPORT_SYMBOL(out_of_line_bug);
#endif
EXPORT_SYMBOL(init_level4_pgt); EXPORT_SYMBOL(init_level4_pgt);
......
...@@ -21,6 +21,8 @@ struct bug_frame { ...@@ -21,6 +21,8 @@ struct bug_frame {
asm volatile("ud2 ; .quad %c1 ; .short %c0" :: \ asm volatile("ud2 ; .quad %c1 ; .short %c0" :: \
"i"(__LINE__), "i" (__stringify(__FILE__))) "i"(__LINE__), "i" (__stringify(__FILE__)))
void out_of_line_bug(void); void out_of_line_bug(void);
#else
static inline void out_of_line_bug(void) { }
#endif #endif
#include <asm-generic/bug.h> #include <asm-generic/bug.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment