From 30932c53d353db00425fe1e61d5456bff4a6ed05 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 14 Mar 2010 17:20:45 +0000 Subject: [uml] add 2.6.34 support git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20208 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../uml/patches-2.6.34/003-fix_text_section.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 target/linux/uml/patches-2.6.34/003-fix_text_section.patch (limited to 'target/linux/uml/patches-2.6.34/003-fix_text_section.patch') diff --git a/target/linux/uml/patches-2.6.34/003-fix_text_section.patch b/target/linux/uml/patches-2.6.34/003-fix_text_section.patch new file mode 100644 index 000000000..f973cfd60 --- /dev/null +++ b/target/linux/uml/patches-2.6.34/003-fix_text_section.patch @@ -0,0 +1,40 @@ +um: remove PAGE_SIZE alignment in linker script causing kernel segfault. + +The linker script cleanup that I did in commit +5d150a97f9391f5bcd7ba0d59d7a11c3de3cea80 accidentally introduced an +ALIGN(PAGE_SIZE) when converting to use INIT_TEXT_SECTION; Richard +Weinberger reported that this causes the kernel to segfault with +CONFIG_STATIC_LINK=y. + +I'm not certain why this extra alignment is a problem, but it seems likely +it is because previously + +__init_begin = _stext = _text = _sinittext + +and with the extra ALIGN(PAGE_SIZE), _sinittext becomes different from the +rest. So there is likely a bug here where something is assuming that +_sinittext is the same as one of those other symbols. But reverting the +accidental change fixes the regression, so it seems worth committing that +now. + +Signed-off-by: Tim Abbott +Reported-by: richard -rw- weinberger +Cc: Jeff Dike +Cc: user-mode-linux-devel@lists.sourceforge.net +--- + arch/um/kernel/uml.lds.S | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S +index e7a6cca..664f942 100644 +--- a/arch/um/kernel/uml.lds.S ++++ b/arch/um/kernel/uml.lds.S +@@ -22,7 +22,7 @@ SECTIONS + _text = .; + _stext = .; + __init_begin = .; +- INIT_TEXT_SECTION(PAGE_SIZE) ++ INIT_TEXT_SECTION(0) + . = ALIGN(PAGE_SIZE); + + .text : -- cgit v1.2.3