summaryrefslogtreecommitdiff
path: root/target/linux/uml/patches-2.6.33/003-fix_text_section.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-12 14:24:17 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-12 14:24:17 +0000
commitea28bcf17f4824dd4343637a0b0c2821b34d2682 (patch)
treebc6b6794eb155abd1022f0fec2adef55ed75fad6 /target/linux/uml/patches-2.6.33/003-fix_text_section.patch
parentcc7e88fe961c1bfd11f34f00a0f42d9ee45bf94a (diff)
[uml] add support for 2.6.33
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20158 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/uml/patches-2.6.33/003-fix_text_section.patch')
-rw-r--r--target/linux/uml/patches-2.6.33/003-fix_text_section.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/uml/patches-2.6.33/003-fix_text_section.patch b/target/linux/uml/patches-2.6.33/003-fix_text_section.patch
new file mode 100644
index 0000000000..f973cfd604
--- /dev/null
+++ b/target/linux/uml/patches-2.6.33/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 <tabbott@ksplice.com>
+Reported-by: richard -rw- weinberger <richard.weinberger@gmail.com>
+Cc: Jeff Dike <jdike@addtoit.com>
+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 :