Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6

[pandora-kernel.git] / include / asm-generic / vmlinux.lds.h

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 7170ad3..b204094 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -67,6 +67,8 @@
                *(.rodata1)                                             \
        }                                                               \
                                                                        \
                *(.rodata1)                                             \
        }                                                               \
                                                                        \

+       BUG_TABLE                                                       \
+                                                                       \

        /* PCI quirks */                                                \
        .pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {        \
                VMLINUX_SYMBOL(__start_pci_fixups_early) = .;           \
        /* PCI quirks */                                                \
        .pci_fixup        : AT(ADDR(.pci_fixup) - LOAD_OFFSET) {        \
                VMLINUX_SYMBOL(__start_pci_fixups_early) = .;           \


@@ -319,6 +321,7 @@
                .stab.indexstr 0 : { *(.stab.indexstr) }                \
                .comment 0 : { *(.comment) }
 
                .stab.indexstr 0 : { *(.stab.indexstr) }                \
                .comment 0 : { *(.comment) }
 

+#ifdef CONFIG_GENERIC_BUG

 #define BUG_TABLE                                                      \
        . = ALIGN(8);                                                   \
        __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) {             \
 #define BUG_TABLE                                                      \
        . = ALIGN(8);                                                   \
        __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) {             \


@@ -326,6 +329,9 @@
                *(__bug_table)                                          \
                __stop___bug_table = .;                                 \
        }
                *(__bug_table)                                          \
                __stop___bug_table = .;                                 \
        }

+#else
+#define BUG_TABLE
+#endif

 
 #ifdef CONFIG_PM_TRACE
 #define TRACEDATA                                                      \
 
 #ifdef CONFIG_PM_TRACE
 #define TRACEDATA                                                      \