aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-12-22 18:20:50 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-12-22 18:20:50 +0000
commit1ccae0efc047862b02787fb9f1d25f2925f805b9 (patch)
tree0963a211471ce5e24ada491588a0162c26493046 /target/linux/uml
parent54ffa895f2b992255fde1b4317e65d6675fd3c52 (diff)
downloadupstream-1ccae0efc047862b02787fb9f1d25f2925f805b9.tar.gz
upstream-1ccae0efc047862b02787fb9f1d25f2925f805b9.tar.bz2
upstream-1ccae0efc047862b02787fb9f1d25f2925f805b9.zip
uml: this patch went upstream
SVN-Revision: 24802
Diffstat (limited to 'target/linux/uml')
-rw-r--r--target/linux/uml/patches-2.6.32/004-fix_text_section.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/target/linux/uml/patches-2.6.32/004-fix_text_section.patch b/target/linux/uml/patches-2.6.32/004-fix_text_section.patch
deleted file mode 100644
index 210435eb3e..0000000000
--- a/target/linux/uml/patches-2.6.32/004-fix_text_section.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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(-)
-
---- 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 :