diff options
author | Nicolas Thill <nico@openwrt.org> | 2010-05-02 04:14:57 +0000 |
---|---|---|
committer | Nicolas Thill <nico@openwrt.org> | 2010-05-02 04:14:57 +0000 |
commit | 489c2adad3c17d0e58b6b9f2b6e02e0b347eb32b (patch) | |
tree | 2577502a93689967220661626f06dc76fa14c2b9 /target/linux/uml/patches-2.6.32/004-fix_text_section.patch | |
parent | 2e66d9c01317dc57705f759cc5a83d205da0b146 (diff) | |
download | mtk-20170518-489c2adad3c17d0e58b6b9f2b6e02e0b347eb32b.zip mtk-20170518-489c2adad3c17d0e58b6b9f2b6e02e0b347eb32b.tar.gz mtk-20170518-489c2adad3c17d0e58b6b9f2b6e02e0b347eb32b.tar.bz2 |
target/uml: rename patch 003 to match what we have in 2.6.30
SVN-Revision: 21292
Diffstat (limited to 'target/linux/uml/patches-2.6.32/004-fix_text_section.patch')
-rw-r--r-- | target/linux/uml/patches-2.6.32/004-fix_text_section.patch | 38 |
1 files changed, 38 insertions, 0 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 new file mode 100644 index 0000000..210435e --- /dev/null +++ b/target/linux/uml/patches-2.6.32/004-fix_text_section.patch @@ -0,0 +1,38 @@ +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 : |