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

Commit dbc367eb authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: merge the mmu and non-mmu versions of bug.h 



Trivial merge of the mmu and non-mmu versions of bug.h

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent b0ffbf26

arch/m68k/include/asm/bug.h

+28 −3
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "bug_no.h"

#ifndef _M68K_BUG_H

#define _M68K_BUG_H



#ifdef CONFIG_MMU

#ifdef CONFIG_BUG

#ifdef CONFIG_DEBUG_BUGVERBOSE

#ifndef CONFIG_SUN3

#define BUG() do { \

	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \

	__builtin_trap(); \

} while (0)

#else

#include "bug_mm.h"

#define BUG() do { \

	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \

	panic("BUG!"); \

} while (0)

#endif

#else

#define BUG() do { \

	__builtin_trap(); \

} while (0)

#endif



#define HAVE_ARCH_BUG

#endif

#endif /* CONFIG_MMU */



#include <asm-generic/bug.h>



#endif

arch/m68k/include/asm/bug_mm.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
#ifndef _M68K_BUG_H

#define _M68K_BUG_H





#ifdef CONFIG_BUG

#ifdef CONFIG_DEBUG_BUGVERBOSE

#ifndef CONFIG_SUN3

#define BUG() do { \

	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \

	__builtin_trap(); \

} while (0)

#else

#define BUG() do { \

	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \

	panic("BUG!"); \

} while (0)

#endif

#else

#define BUG() do { \

	__builtin_trap(); \

} while (0)

#endif



#define HAVE_ARCH_BUG

#endif



#include <asm-generic/bug.h>



#endif

arch/m68k/include/asm/bug_no.h

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
#ifndef _M68KNOMMU_BUG_H

#define _M68KNOMMU_BUG_H

#include <asm-generic/bug.h>

#endif