3.11-stable patches

added patches:
	xtensa-fix-broken-allmodconfig-build.patch

diff --git a/queue-3.11/series b/queue-3.11/series
index 09da318f957b640da774adee90ba8278774bcd4e..261ea6fc8aadff7fa7f744fed6aba7781e3396b1 100644 (file)
--- a/queue-3.11/series
+++ b/queue-3.11/series
@@ -1,2 +1,3 @@
 arc-smp-failed-to-boot-due-to-missing-ivt-setup.patch
 ipc-msg.c-fix-lost-wakeup-in-msgsnd.patch
+xtensa-fix-broken-allmodconfig-build.patch

diff --git a/queue-3.11/xtensa-fix-broken-allmodconfig-build.patch b/queue-3.11/xtensa-fix-broken-allmodconfig-build.patch
new file mode 100644 (file)
index 0000000..891c4a6
--- /dev/null
+++ b/queue-3.11/xtensa-fix-broken-allmodconfig-build.patch
@@ -0,0 +1,37 @@
+From 8872366df396444d7655287c79ed182d8f47cba6 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Tue, 27 Aug 2013 21:06:37 -0700
+Subject: xtensa: Fix broken allmodconfig build
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit 8872366df396444d7655287c79ed182d8f47cba6 upstream.
+
+xtansa allmodbuild fails with:
+
+arch/xtensa/kernel/xtensa_ksyms.c:129:1: error: '_mcount' undeclared here (not in a function)
+make[2]: *** [arch/xtensa/kernel/xtensa_ksyms.o] Error 1
+make[1]: *** [arch/xtensa/kernel] Error 2
+
+The breakage is due to commit 478ba61af (xtensa: add static function tracer
+support) which exports _mcount without declaring it.
+
+Cc: Max Filippov <jcmvbkbc@gmail.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Chris Zankel <chris@zankel.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/xtensa/kernel/xtensa_ksyms.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/xtensa/kernel/xtensa_ksyms.c
++++ b/arch/xtensa/kernel/xtensa_ksyms.c
+@@ -25,6 +25,7 @@
+ #include <asm/io.h>
+ #include <asm/page.h>
+ #include <asm/pgalloc.h>
++#include <asm/ftrace.h>
+ #ifdef CONFIG_BLK_DEV_FD
+ #include <asm/floppy.h>
+ #endif