From: Nicolas Thill Date: Sun, 2 May 2010 04:14:57 +0000 (+0000) Subject: target/uml: rename patch 003 to match what we have in 2.6.30 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=489c2adad3c17d0e58b6b9f2b6e02e0b347eb32b;p=openwrt%2Fstaging%2Fneocturne.git target/uml: rename patch 003 to match what we have in 2.6.30 SVN-Revision: 21292 --- diff --git a/target/linux/uml/patches-2.6.32/003-fix_text_section.patch b/target/linux/uml/patches-2.6.32/003-fix_text_section.patch deleted file mode 100644 index 210435eb3e..0000000000 --- a/target/linux/uml/patches-2.6.32/003-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 -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(-) - ---- 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 : 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 0000000000..210435eb3e --- /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 +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(-) + +--- 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 :