From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 2 May 2010 02:40:21 +0000 (+0000)
Subject: target/uml: refresh 2.6.30 patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2e66d9c01317dc57705f759cc5a83d205da0b146;p=openwrt%2Fstaging%2F981213.git

target/uml: refresh 2.6.30 patches

SVN-Revision: 21291
---

diff --git a/target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch b/target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch
index 340a5f2668..d729a05c2b 100644
--- a/target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch
+++ b/target/linux/uml/patches-2.6.30/006-uml_libc_link_errors.patch
@@ -1,8 +1,6 @@
-diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
-index 7fcad58..85babf5 100644
 --- a/arch/um/kernel/dyn.lds.S
 +++ b/arch/um/kernel/dyn.lds.S
-@@ -50,8 +50,21 @@ SECTIONS
+@@ -54,8 +54,21 @@ SECTIONS
    .rela.got       : { *(.rela.got) }
    .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
    .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
@@ -26,11 +24,9 @@ index 7fcad58..85babf5 100644
    .init           : {
      KEEP (*(.init))
    } =0x90909090
-diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
-index e7a6cca..50d80e8 100644
 --- a/arch/um/kernel/uml.lds.S
 +++ b/arch/um/kernel/uml.lds.S
-@@ -35,6 +35,21 @@ SECTIONS
+@@ -39,6 +39,21 @@ SECTIONS
      *(.gnu.warning)
      *(.gnu.linkonce.t*)
    }
@@ -49,6 +45,6 @@ index e7a6cca..50d80e8 100644
 +    *(.rela.iplt)
 +    PROVIDE_HIDDEN (__rela_iplt_end = .);
 +  }
-
+ 
    . = ALIGN(PAGE_SIZE);
    .syscall_stub : {