summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 15:28:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 15:28:10 -0700
commitd18bb9a548e550f3ced57618e75085fb3f173133 (patch)
treeea6be1655c55422cb5a1df84ae08f150b60e6808 /include
parent4bb0057f996b1491f93a64879f4c53c83bc0f0c7 (diff)
parent6d72b7952fa7d7c61d021398970c29afde6a4443 (diff)
downloadop-kernel-dev-d18bb9a548e550f3ced57618e75085fb3f173133.zip
op-kernel-dev-d18bb9a548e550f3ced57618e75085fb3f173133.tar.gz
Merge branch 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: move BUG_TABLE into RODATA
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/vmlinux.lds.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index f1992dc..bf2851f 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -67,6 +67,8 @@
*(.rodata1) \
} \
\
+ BUG_TABLE \
+ \
/* PCI quirks */ \
.pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_pci_fixups_early) = .; \
@@ -312,6 +314,7 @@
.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) { \
@@ -319,6 +322,9 @@
*(__bug_table) \
__stop___bug_table = .; \
}
+#else
+#define BUG_TABLE
+#endif
#ifdef CONFIG_PM_TRACE
#define TRACEDATA \
OpenPOWER on IntegriCloud