2 files changed, 24 insertions, 0 deletions

diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index c92ae0f166ff..47e3561638b1 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -4,6 +4,22 @@
 #include <linux/compiler.h>
 
 #ifdef CONFIG_BUG
+
+#ifdef CONFIG_GENERIC_BUG
+#ifndef __ASSEMBLY__
+struct bug_entry {
+        unsigned long   bug_addr;
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+        const char      *file;
+        unsigned short  line;
+#endif
+        unsigned short  flags;
+};
+#endif          /* __ASSEMBLY__ */
+
+#define BUGFLAG_WARNING (1<<0)
+#endif  /* CONFIG_GENERIC_BUG */
+
 #ifndef HAVE_ARCH_BUG
 #define BUG() do { \
         printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 4d4c62d11059..6e9fcebbf89f 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -218,6 +218,14 @@
                 .stab.indexstr 0 : { *(.stab.indexstr) }                \
                 .comment 0 : { *(.comment) }
 
+#define BUG_TABLE                                                       \
+        . = ALIGN(8);                                                   \
+        __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) {             \
+                __start___bug_table = .;                                \
+                *(__bug_table)                                          \
+                __stop___bug_table = .;                                 \
+        }
+
 #define NOTES                                                           \
                 .notes : { *(.note.*) } :note