diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /arch/alpha/kernel/vmlinux.lds.S | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/alpha/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/alpha/kernel/vmlinux.lds.S | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index b9d6568e5f7f..6dc03c35caa0 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S | |||
@@ -134,13 +134,6 @@ SECTIONS | |||
134 | __bss_stop = .; | 134 | __bss_stop = .; |
135 | _end = .; | 135 | _end = .; |
136 | 136 | ||
137 | /* Sections to be discarded */ | ||
138 | /DISCARD/ : { | ||
139 | EXIT_TEXT | ||
140 | EXIT_DATA | ||
141 | *(.exitcall.exit) | ||
142 | } | ||
143 | |||
144 | .mdebug 0 : { | 137 | .mdebug 0 : { |
145 | *(.mdebug) | 138 | *(.mdebug) |
146 | } | 139 | } |
@@ -150,4 +143,6 @@ SECTIONS | |||
150 | 143 | ||
151 | STABS_DEBUG | 144 | STABS_DEBUG |
152 | DWARF_DEBUG | 145 | DWARF_DEBUG |
146 | |||
147 | DISCARDS | ||
153 | } | 148 | } |