lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] x86_64: CONFIG_BUG=n fixes

Browse Source 
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: Alexander Nyberg <alexn@telia.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alexander Nyberg
2005-05-25 12:31:28 -07:00
committed by Linus Torvalds
parent dca79a046b
commit 4f60fdf613
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86_64/kernel/traps.c
View File

@@ -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;

3
arch/x86_64/kernel/x8664_ksyms.c
View File

@@ -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);

2
include/asm-x86_64/bug.h
View File

@@ -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>