From 68fdc55c48fd2e8f4938a1e815216c25baf8a17e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 17 Oct 2007 17:19:30 +0200 Subject: [PATCH] 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: Thomas Gleixner --- include/asm-x86/{bug_64.h => bug.h} | 20 ++++++++++++++------ include/asm-x86/bug_32.h | 37 ------------------------------------- 2 files changed, 14 insertions(+), 43 deletions(-) rename include/asm-x86/{bug_64.h => bug.h} (69%) delete mode 100644 include/asm-x86/bug_32.h diff --git a/include/asm-x86/bug_64.h b/include/asm-x86/bug.h similarity index 69% rename from include/asm-x86/bug_64.h rename to include/asm-x86/bug.h index 68260641491..fd8bdc639c4 100644 --- a/include/asm-x86/bug_64.h +++ b/include/asm-x86/bug.h @@ -1,22 +1,30 @@ -#ifndef __ASM_X8664_BUG_H -#define __ASM_X8664_BUG_H 1 +#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 +# define __BUG_C0 "2:\t.long 1b, %c0\n" +#else +# define __BUG_C0 "2:\t.quad 1b, %c0\n" +#endif + #define BUG() \ do { \ asm volatile("1:\tud2\n" \ ".pushsection __bug_table,\"a\"\n" \ - "2:\t.quad 1b, %c0\n" \ + __BUG_C0 \ "\t.word %c1, 0\n" \ "\t.org 2b+%c2\n" \ ".popsection" \ : : "i" (__FILE__), "i" (__LINE__), \ - "i" (sizeof(struct bug_entry))); \ + "i" (sizeof(struct bug_entry))); \ for(;;) ; \ } while(0) + #else #define BUG() \ do { \ @@ -26,9 +34,9 @@ #endif void out_of_line_bug(void); -#else +#else /* CONFIG_BUG */ static inline void out_of_line_bug(void) { } -#endif +#endif /* !CONFIG_BUG */ #include #endif diff --git a/include/asm-x86/bug_32.h b/include/asm-x86/bug_32.h deleted file mode 100644 index b0fd78ca261..00000000000 --- a/include/asm-x86/bug_32.h +++ /dev/null @@ -1,37 +0,0 @@ -#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 -#endif -- 2.11.4.GIT