OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  move BUG_TABLE into RODATA
This commit is contained in:
Linus Torvalds 2008-07-14 15:28:10 -07:00
commit d18bb9a548
9 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/avr32/kernel/vmlinux.lds.S
View File

@ -85,8 +85,6 @@ SECTIONS
__stop___ex_table = .;
}
BUG_TABLE
RODATA
. = ALIGN(THREAD_SIZE);

1
arch/parisc/kernel/vmlinux.lds.S
View File

@ -67,7 +67,6 @@ SECTIONS
_etext = .;
RODATA
BUG_TABLE
/* writeable */
/* Make sure this is page aligned so

2
arch/powerpc/kernel/vmlinux.lds.S
View File

@ -64,8 +64,6 @@ SECTIONS
NOTES
BUG_TABLE
/*
* Init sections discarded at runtime
*/

1
arch/s390/kernel/vmlinux.lds.S
View File

@ -40,7 +40,6 @@ SECTIONS
_etext = .; /* End of text section */
NOTES :text :note
BUG_TABLE :text
RODATA

1
arch/sh/kernel/vmlinux_32.lds.S
View File

@ -44,7 +44,6 @@ SECTIONS
_etext = .; /* End of text section */
BUG_TABLE
NOTES
RO_DATA(PAGE_SIZE)

1
arch/sh/kernel/vmlinux_64.lds.S
View File

@ -65,7 +65,6 @@ SECTIONS
_etext = .; /* End of text section */
BUG_TABLE
NOTES
RO_DATA(PAGE_SIZE)

8
arch/x86/kernel/vmlinux_32.lds.S
View File

@ -49,16 +49,14 @@ SECTIONS
_etext = .; /* End of text section */
} :text = 0x9090
NOTES :text :note
. = ALIGN(16); /* Exception table */
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
__start___ex_table = .;
*(__ex_table)
__stop___ex_table = .;
}
NOTES :text :note
BUG_TABLE :text
} :text = 0x9090
RODATA

10
arch/x86/kernel/vmlinux_64.lds.S
View File

@ -19,7 +19,7 @@ PHDRS {
data PT_LOAD FLAGS(7); /* RWE */
user PT_LOAD FLAGS(7); /* RWE */
data.init PT_LOAD FLAGS(7); /* RWE */
note PT_NOTE FLAGS(4); /* R__ */
note PT_NOTE FLAGS(0); /* ___ */
}
SECTIONS
{
@ -40,16 +40,14 @@ SECTIONS
_etext = .; /* End of text section */
} :text = 0x9090
NOTES :text :note
. = ALIGN(16); /* Exception table */
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
__start___ex_table = .;
*(__ex_table)
__stop___ex_table = .;
}
NOTES :text :note
BUG_TABLE :text
} :text = 0x9090
RODATA

6
include/asm-generic/vmlinux.lds.h
View File

@ -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 \