3.0-stable patches

added patches:
	cris-add-_sdata-to-vmlinux.lds.s.patch

diff --git a/queue-3.0/cris-add-_sdata-to-vmlinux.lds.s.patch b/queue-3.0/cris-add-_sdata-to-vmlinux.lds.s.patch
new file mode 100644 (file)
index 0000000..2832a08
--- /dev/null
+++ b/queue-3.0/cris-add-_sdata-to-vmlinux.lds.s.patch
@@ -0,0 +1,33 @@
+From 473e162eea465e60578edb93341752e7f1c1dacc Mon Sep 17 00:00:00 2001
+From: Jesper Nilsson <jesper.nilsson@axis.com>
+Date: Mon, 24 Oct 2011 11:19:25 +0200
+Subject: CRIS: Add _sdata to vmlinux.lds.S
+
+From: Jesper Nilsson <jesper.nilsson@axis.com>
+
+commit 473e162eea465e60578edb93341752e7f1c1dacc upstream.
+
+Fixes link error:
+  LD      vmlinux
+kernel/built-in.o: In function `core_kernel_data':
+(.text+0x13e44): undefined reference to `_sdata'
+
+Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/cris/kernel/vmlinux.lds.S |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/cris/kernel/vmlinux.lds.S
++++ b/arch/cris/kernel/vmlinux.lds.S
+@@ -52,6 +52,7 @@ SECTIONS
+ 
+       EXCEPTION_TABLE(4)
+ 
++      _sdata = .;
+       RODATA
+ 
+       . = ALIGN (4);

diff --git a/queue-3.0/series b/queue-3.0/series
index 3f64cac9b65ad9f50043e59378a3f4ca7ff343a4..b6f5ada5009e86dbb93cec3f28ea317400f9a0c3 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -1 +1,2 @@
 futex-take-hugepages-into-account-when-generating-futex_key.patch
+cris-add-_sdata-to-vmlinux.lds.s.patch