diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-06-20 15:52:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-20 17:39:35 -0400 |
commit | 5e7b6ed8e9bf3c8e3bb579fd0aec64f6526f8c81 (patch) | |
tree | 689926de5ab257b5cd55915e2e3d1128f8537709 /arch/xtensa/kernel | |
parent | 3a981f482cc29f7d0aeab509e51ea15519a6e961 (diff) |
xtensa: replace xtensa-specific _f{data,text} by _s{data,text}
commit a2d063ac216c161 ("extable, core_kernel_data(): Make sure all archs
define _sdata") missed xtensa. Xtensa does have a start of data marker,
but calls it _fdata, causing
kernel/built-in.o:(.text+0x964): undefined reference to `_sdata'
_stext was already defined, but it was duplicated by _fdata.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/xtensa/kernel')
-rw-r--r-- | arch/xtensa/kernel/vmlinux.lds.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S index 88ecea3facb4..ee2e2089483d 100644 --- a/arch/xtensa/kernel/vmlinux.lds.S +++ b/arch/xtensa/kernel/vmlinux.lds.S | |||
@@ -83,7 +83,6 @@ SECTIONS | |||
83 | 83 | ||
84 | _text = .; | 84 | _text = .; |
85 | _stext = .; | 85 | _stext = .; |
86 | _ftext = .; | ||
87 | 86 | ||
88 | .text : | 87 | .text : |
89 | { | 88 | { |
@@ -112,7 +111,7 @@ SECTIONS | |||
112 | EXCEPTION_TABLE(16) | 111 | EXCEPTION_TABLE(16) |
113 | /* Data section */ | 112 | /* Data section */ |
114 | 113 | ||
115 | _fdata = .; | 114 | _sdata = .; |
116 | RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE) | 115 | RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE) |
117 | _edata = .; | 116 | _edata = .; |
118 | 117 | ||