diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-26 13:27:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-26 13:27:00 -0400 |
commit | c67dda14389205f0a223c5089307495290939b3b (patch) | |
tree | fad0bb26b28703d02a22ebdd44d94eabac4a2ade /arch/frv/kernel/vmlinux.lds.S | |
parent | 43bc2db47292a824152145253b1dd2847e7312a3 (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/frv/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/frv/kernel/vmlinux.lds.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S index cbe811fccfcc..8b973f3cc90e 100644 --- a/arch/frv/kernel/vmlinux.lds.S +++ b/arch/frv/kernel/vmlinux.lds.S | |||
@@ -57,10 +57,10 @@ SECTIONS | |||
57 | _text = .; | 57 | _text = .; |
58 | _stext = .; | 58 | _stext = .; |
59 | .text : { | 59 | .text : { |
60 | *(.text.start) | 60 | *(.text..start) |
61 | *(.text.entry) | 61 | *(.text..entry) |
62 | *(.text.break) | 62 | *(.text..break) |
63 | *(.text.tlbmiss) | 63 | *(.text..tlbmiss) |
64 | TEXT_TEXT | 64 | TEXT_TEXT |
65 | SCHED_TEXT | 65 | SCHED_TEXT |
66 | LOCK_TEXT | 66 | LOCK_TEXT |
@@ -114,7 +114,7 @@ SECTIONS | |||
114 | 114 | ||
115 | .sbss : { *(.sbss .sbss.*) } | 115 | .sbss : { *(.sbss .sbss.*) } |
116 | .bss : { *(.bss .bss.*) } | 116 | .bss : { *(.bss .bss.*) } |
117 | .bss.stack : { *(.bss) } | 117 | .bss..stack : { *(.bss) } |
118 | 118 | ||
119 | __bss_stop = .; | 119 | __bss_stop = .; |
120 | _end = . ; | 120 | _end = . ; |