[PATCH] powerpc: Merge bug.h

ppc32/ppc64: Merge bug.h into include/asm-powerpc

This patch merges bug.h into include/asm-powerpc.  Changed the data
structure for bug_entry such that line is always an int on both 32 and
64-bit platforms; removed casts to int from the 64-bit trap code to
reflect this.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Becky Bruce <Becky.Bruce@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 0 insertions, 69 deletions

diff --git a/include/asm-ppc64/bug.h b/include/asm-ppc64/bug.h
deleted file mode 100644
index 160178278861..000000000000
--- a/include/asm-ppc64/bug.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef _PPC64_BUG_H
-#define _PPC64_BUG_H
-
-/*
- * Define an illegal instr to trap on the bug.
- * We don't use 0 because that marks the end of a function
- * in the ELF ABI.  That's "Boo Boo" in case you wonder...
- */
-#define BUG_OPCODE .long 0x00b00b00  /* For asm */
-#define BUG_ILLEGAL_INSTR "0x00b00b00" /* For BUG macro */
-
-#ifndef __ASSEMBLY__
-
-struct bug_entry {
-        unsigned long   bug_addr;
-        long            line;
-        const char      *file;
-        const char      *function;
-};
-
-struct bug_entry *find_bug(unsigned long bugaddr);
-
-/*
- * If this bit is set in the line number it means that the trap
- * is for WARN_ON rather than BUG or BUG_ON.
- */
-#define BUG_WARNING_TRAP        0x1000000
-
-#ifdef CONFIG_BUG
-
-#define BUG() do {                                                       \
-        __asm__ __volatile__(                                            \
-                "1:     twi 31,0,0\n"                                    \
-                ".section __bug_table,\"a\"\n\t"                         \
-                "       .llong 1b,%0,%1,%2\n"                            \
-                ".previous"                                              \
-                : : "i" (__LINE__), "i" (__FILE__), "i" (__FUNCTION__)); \
-} while (0)
-
-#define BUG_ON(x) do {                                          \
-        __asm__ __volatile__(                                   \
-                "1:     tdnei %0,0\n"                           \
-                ".section __bug_table,\"a\"\n\t"                \
-                "       .llong 1b,%1,%2,%3\n"                   \
-                ".previous"                                     \
-                : : "r" ((long long)(x)), "i" (__LINE__),       \
-                    "i" (__FILE__), "i" (__FUNCTION__));        \
-} while (0)
-
-#define WARN_ON(x) do {                                         \
-        __asm__ __volatile__(                                   \
-                "1:     tdnei %0,0\n"                           \
-                ".section __bug_table,\"a\"\n\t"                \
-                "       .llong 1b,%1,%2,%3\n"                   \
-                ".previous"                                     \
-                : : "r" ((long long)(x)),                       \
-                    "i" (__LINE__ + BUG_WARNING_TRAP),          \
-                    "i" (__FILE__), "i" (__FUNCTION__));        \
-} while (0)
-
-#define HAVE_ARCH_BUG
-#define HAVE_ARCH_BUG_ON
-#define HAVE_ARCH_WARN_ON
-#endif
-#endif
-
-#include <asm-generic/bug.h>
-
-#endif