From: Chris Wright <chrisw@sous-sol.org>
Date: Fri, 6 Apr 2007 19:56:22 +0000 (-0700)
Subject: Fix UML linker script, noted by Blaisorblade (missing . in .note), bad
X-Git-Tag: v2.6.20.5~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1484843d40a583600ccfd9b8582ce02c1f33c53a;p=thirdparty%2Fkernel%2Fstable-queue.git

Fix UML linker script, noted by Blaisorblade (missing . in .note), bad
patch in 2.6.20.5
---

diff --git a/queue-2.6.20/series b/queue-2.6.20/series
index 68d4ef9ce14..7298a7a923e 100644
--- a/queue-2.6.20/series
+++ b/queue-2.6.20/series
@@ -1 +1,2 @@
+uml-fix-static-linking-for-real.patch
 crypto-api-use-the-right-value-when-advancing-scatterwalk_copychunks.patch
diff --git a/queue-2.6.20/uml-fix-static-linking-for-real.patch b/queue-2.6.20/uml-fix-static-linking-for-real.patch
new file mode 100644
index 00000000000..4364ba43049
--- /dev/null
+++ b/queue-2.6.20/uml-fix-static-linking-for-real.patch
@@ -0,0 +1,28 @@
+From c35e584c087381aaa5f1ed40a28b978535c18fb2 Mon Sep 17 00:00:00 2001
+From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
+Date: Sat, 31 Mar 2007 03:20:27 +0200
+Subject: [PATCH] uml: fix static linking for real
+
+There was a typo in commit b40b478e9972ec14cf144f1a03f88918789cbfe0,
+preventing it from working - 32bit binaries crashed hopelessly before
+the below fix and work perfectly now.
+
+Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+[chrisw: update changelog to reflect -stable commit id]
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ include/asm-um/common.lds.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.20.5.orig/include/asm-um/common.lds.S
++++ linux-2.6.20.5/include/asm-um/common.lds.S
+@@ -15,7 +15,7 @@
+   PROVIDE (_unprotected_end = .);
+ 
+   . = ALIGN(4096);
+-  .note : { *(note.*) }
++  .note : { *(.note.*) }
+   __start___ex_table = .;
+   __ex_table : { *(__ex_table) }
+   __stop___ex_table = .;