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

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

[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

arch/x86_64/kernel/traps.c

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

arch/x86_64/kernel/x8664_ksyms.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -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);

include/asm-x86_64/bug.h

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