diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:35:31 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:35:31 +0100 |
commit | 749dfc70554f2c9e6624ac843d66571265ed9338 (patch) | |
tree | bf591255b3f158222f90852d53c4279e6e7e9ced /arch/mips/kernel/vmlinux.lds.S | |
parent | Merge branch 'upstream-fixes' (diff) | |
parent | [PATCH] 3c509: bus registration fix (diff) | |
download | linux-749dfc70554f2c9e6624ac843d66571265ed9338.tar.xz linux-749dfc70554f2c9e6624ac843d66571265ed9338.zip |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/mips/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/mips/kernel/vmlinux.lds.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index ff699dbb99f7..2ad0cedf29fe 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S @@ -106,6 +106,9 @@ SECTIONS .con_initcall.init : { *(.con_initcall.init) } __con_initcall_end = .; SECURITY_INIT + /* .exit.text is discarded at runtime, not link time, to deal with + references from .rodata */ + .exit.text : { *(.exit.text) } . = ALIGN(_PAGE_SIZE); __initramfs_start = .; .init.ramfs : { *(.init.ramfs) } @@ -133,7 +136,6 @@ SECTIONS /* Sections to be discarded */ /DISCARD/ : { - *(.exit.text) *(.exit.data) *(.exitcall.exit) |