diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 15:28:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 15:28:10 -0700 |
| commit | d18bb9a548e550f3ced57618e75085fb3f173133 (patch) | |
| tree | ea6be1655c55422cb5a1df84ae08f150b60e6808 /arch/x86/kernel/vmlinux_32.lds.S | |
| parent | Merge branch 'core/printk' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | Merge branch 'linus' into core/rodata (diff) | |
| download | linux-dev-d18bb9a548e550f3ced57618e75085fb3f173133.tar.xz linux-dev-d18bb9a548e550f3ced57618e75085fb3f173133.zip | |
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 'arch/x86/kernel/vmlinux_32.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux_32.lds.S | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index 2674f5796275..cdb2363697d2 100644 --- a/arch/x86/kernel/vmlinux_32.lds.S +++ b/arch/x86/kernel/vmlinux_32.lds.S @@ -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 |