diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 14:47:57 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 14:47:57 +0200 |
commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /arch/cris/kernel/vmlinux.lds.S | |
parent | ARM: s3c: fix check of index into s3c_gpios[] (diff) | |
parent | Thumb-2: Correctly handle undefined instructions in the kernel (diff) | |
download | linux-40d743b8c16a8cf6e30c1d941aa6147f9550ea75.tar.xz linux-40d743b8c16a8cf6e30c1d941aa6147f9550ea75.zip |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/cris/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/cris/kernel/vmlinux.lds.S | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S index 0d2adfc794d4..6c81836b9229 100644 --- a/arch/cris/kernel/vmlinux.lds.S +++ b/arch/cris/kernel/vmlinux.lds.S @@ -140,12 +140,7 @@ SECTIONS _end = .; __end = .; - /* Sections to be discarded */ - /DISCARD/ : { - EXIT_TEXT - EXIT_DATA - *(.exitcall.exit) - } - dram_end = dram_start + (CONFIG_ETRAX_DRAM_SIZE - __CONFIG_ETRAX_VMEM_SIZE)*1024*1024; + + DISCARDS } |