aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/mm
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2012-06-20 15:52:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-20 17:39:35 -0400
commit5e7b6ed8e9bf3c8e3bb579fd0aec64f6526f8c81 (patch)
tree689926de5ab257b5cd55915e2e3d1128f8537709 /arch/xtensa/mm
parent3a981f482cc29f7d0aeab509e51ea15519a6e961 (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/mm')
-rw-r--r--arch/xtensa/mm/init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index ba150e5de2eb..c82af58f60bc 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -29,7 +29,7 @@
29 29
30/* References to section boundaries */ 30/* References to section boundaries */
31 31
32extern char _ftext, _etext, _fdata, _edata, _rodata_end; 32extern char _stext, _etext, _sdata, _edata, _rodata_end;
33extern char __init_begin, __init_end; 33extern char __init_begin, __init_end;
34 34
35/* 35/*
@@ -197,8 +197,8 @@ void __init mem_init(void)
197 reservedpages++; 197 reservedpages++;
198 } 198 }
199 199
200 codesize = (unsigned long) &_etext - (unsigned long) &_ftext; 200 codesize = (unsigned long) &_etext - (unsigned long) &_stext;
201 datasize = (unsigned long) &_edata - (unsigned long) &_fdata; 201 datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
202 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; 202 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
203 203
204 printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, " 204 printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "