Commit 68fdc55c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

x86: unify include/asm/bug_32/64.h 



Same file, except for whitespace, comment formatting and the
.long/.quad delta which can be solved by a define.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 5c8eec50

include/asm-x86/bug.h

+39 −2
Original line number Diff line number Diff line 
#ifndef _ASM_X86_BUG_H

#define _ASM_X86_BUG_H



#ifdef CONFIG_BUG

#define HAVE_ARCH_BUG



#ifdef CONFIG_DEBUG_BUGVERBOSE



#ifdef CONFIG_X86_32

# include "bug_32.h"

# define __BUG_C0	"2:\t.long 1b, %c0\n"

#else

# include "bug_64.h"

# define __BUG_C0	"2:\t.quad 1b, %c0\n"

#endif



#define BUG()								\

	do {								\

		asm volatile("1:\tud2\n"				\

			     ".pushsection __bug_table,\"a\"\n"		\

			     __BUG_C0					\

			     "\t.word %c1, 0\n"				\

			     "\t.org 2b+%c2\n"				\

			     ".popsection"				\

			     : : "i" (__FILE__), "i" (__LINE__),	\

			     "i" (sizeof(struct bug_entry)));		\

		for(;;) ;						\

	} while(0)



#else

#define BUG()								\

	do {								\

		asm volatile("ud2");					\

		for(;;) ;						\

	} while(0)

#endif



void out_of_line_bug(void);

#else /* CONFIG_BUG */

static inline void out_of_line_bug(void) { }

#endif /* !CONFIG_BUG */



#include <asm-generic/bug.h>

#endif

include/asm-x86/bug_32.h

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
#ifndef _I386_BUG_H

#define _I386_BUG_H





/*

 * Tell the user there is some problem.

 * The offending file and line are encoded encoded in the __bug_table section.

 */



#ifdef CONFIG_BUG

#define HAVE_ARCH_BUG



#ifdef CONFIG_DEBUG_BUGVERBOSE

#define BUG()								\

	do {								\

		asm volatile("1:\tud2\n"				\

			     ".pushsection __bug_table,\"a\"\n"		\

			     "2:\t.long 1b, %c0\n"			\

			     "\t.word %c1, 0\n"				\

			     "\t.org 2b+%c2\n"				\

			     ".popsection"				\

			     : : "i" (__FILE__), "i" (__LINE__),	\

			     "i" (sizeof(struct bug_entry)));		\

		for(;;) ;						\

	} while(0)



#else

#define BUG()								\

	do {								\

		asm volatile("ud2");					\

		for(;;) ;						\

	} while(0)

#endif

#endif



#include <asm-generic/bug.h>

#endif

include/asm-x86/bug_64.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
#ifndef __ASM_X8664_BUG_H

#define __ASM_X8664_BUG_H 1



#ifdef CONFIG_BUG

#define HAVE_ARCH_BUG



#ifdef CONFIG_DEBUG_BUGVERBOSE

#define BUG()								\

	do {								\

		asm volatile("1:\tud2\n"				\

			     ".pushsection __bug_table,\"a\"\n"		\

			     "2:\t.quad 1b, %c0\n"			\

			     "\t.word %c1, 0\n"				\

			     "\t.org 2b+%c2\n"				\

			     ".popsection"				\

			     : : "i" (__FILE__), "i" (__LINE__),	\

			        "i" (sizeof(struct bug_entry)));	\

		for(;;) ;						\

	} while(0)

#else

#define BUG()								\

	do {								\

		asm volatile("ud2");					\

		for(;;) ;						\

	} while(0)

#endif



void out_of_line_bug(void);

#else

static inline void out_of_line_bug(void) { }

#endif



#include <asm-generic/bug.h>

#endif