This is a note to let you know that I've just added the patch titled
xtensa: replace xtensa-specific _f{data,text} by _s{data,text}
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xtensa-replace-xtensa-specific-_f-data-text-by-_s-data-text.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5e7b6ed8e9bf3c8e3bb579fd0aec64f6526f8c81 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Date: Wed, 20 Jun 2012 12:52:58 -0700
Subject: xtensa: replace xtensa-specific _f{data,text} by _s{data,text}
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 5e7b6ed8e9bf3c8e3bb579fd0aec64f6526f8c81 upstream.
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@xxxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Chris Zankel <chris@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/xtensa/kernel/vmlinux.lds.S | 3 +--
arch/xtensa/mm/init.c | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -83,7 +83,6 @@ SECTIONS
_text = .;
_stext = .;
- _ftext = .;
.text :
{
@@ -112,7 +111,7 @@ SECTIONS
EXCEPTION_TABLE(16)
/* Data section */
- _fdata = .;
+ _sdata = .;
RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
_edata = .;
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -29,7 +29,7 @@
/* References to section boundaries */
-extern char _ftext, _etext, _fdata, _edata, _rodata_end;
+extern char _stext, _etext, _sdata, _edata, _rodata_end;
extern char __init_begin, __init_end;
/*
@@ -197,8 +197,8 @@ void __init mem_init(void)
reservedpages++;
}
- codesize = (unsigned long) &_etext - (unsigned long) &_ftext;
- datasize = (unsigned long) &_edata - (unsigned long) &_fdata;
+ codesize = (unsigned long) &_etext - (unsigned long) &_stext;
+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "
Patches currently in stable-queue which might be from geert@xxxxxxxxxxxxxx are
queue-3.4/xtensa-fix-linker-script-transformation-for-.text.unlikely.patch
queue-3.4/cris-add-_sdata-to-vmlinux.lds.s.patch
queue-3.4/vm-add-no-mmu-vm_iomap_memory-stub.patch
queue-3.4/cris-remove-old-legacy-traditional-flag-from-arch-v10-lib-makefile.patch
queue-3.4/xtensa-replace-xtensa-specific-_f-data-text-by-_s-data-text.patch
queue-3.4/hid-microsoft-do-not-use-compound-literal-fix-build.patch
queue-3.4/cris-posix_types.h-include-asm-generic-posix_types.h.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html