From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 13 Jan 2014 17:58:58 +0000 (-0800)
Subject: 3.4-stable patches
X-Git-Tag: v3.4.77~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10b71fc6258fc33bd91bc4830c2ddfc8e40a4737;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	arm-fix-bad-mode-in-...-handler-message-for-undefined-instructions.patch
---

diff --git a/queue-3.4/arm-fix-bad-mode-in-...-handler-message-for-undefined-instructions.patch b/queue-3.4/arm-fix-bad-mode-in-...-handler-message-for-undefined-instructions.patch
new file mode 100644
index 00000000000..d0aa58c83bf
--- /dev/null
+++ b/queue-3.4/arm-fix-bad-mode-in-...-handler-message-for-undefined-instructions.patch
@@ -0,0 +1,36 @@
+From 29c350bf28da333e41e30497b649fe335712a2ab Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+Date: Fri, 3 Jan 2014 15:01:39 +0000
+Subject: ARM: fix "bad mode in ... handler" message for undefined instructions
+
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+
+commit 29c350bf28da333e41e30497b649fe335712a2ab upstream.
+
+The array was missing the final entry for the undefined instruction
+exception handler; this commit adds it.
+
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/kernel/traps.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/kernel/traps.c
++++ b/arch/arm/kernel/traps.c
+@@ -37,7 +37,13 @@
+ 
+ #include "signal.h"
+ 
+-static const char *handler[]= { "prefetch abort", "data abort", "address exception", "interrupt" };
++static const char *handler[]= {
++	"prefetch abort",
++	"data abort",
++	"address exception",
++	"interrupt",
++	"undefined instruction",
++};
+ 
+ void *vectors_page;
+ 
diff --git a/queue-3.4/series b/queue-3.4/series
index d5ae80f080c..8cf54fa97ee 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -18,3 +18,4 @@ net-rose-restore-old-recvmsg-behavior.patch
 vlan-fix-header-ops-passthru-when-doing-tx-vlan-offload.patch
 net-llc-fix-use-after-free-in-llc_ui_recvmsg.patch
 bridge-use-spin_lock_bh-in-br_multicast_set_hash_max.patch
+arm-fix-bad-mode-in-...-handler-message-for-undefined-instructions.patch