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

3.10-stable patches

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

diff --git a/queue-3.10/arm-fix-bad-mode-in-...-handler-message-for-undefined-instructions.patch b/queue-3.10/arm-fix-bad-mode-in-...-handler-message-for-undefined-instructions.patch
new file mode 100644
index 00000000000..16c1a8f1657
--- /dev/null
+++ b/queue-3.10/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
+@@ -35,7 +35,13 @@
+ #include <asm/tls.h>
+ #include <asm/system_misc.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.10/arm-fix-footbridge-clockevent-device.patch b/queue-3.10/arm-fix-footbridge-clockevent-device.patch
new file mode 100644
index 00000000000..51dca5c8f49
--- /dev/null
+++ b/queue-3.10/arm-fix-footbridge-clockevent-device.patch
@@ -0,0 +1,39 @@
+From 4ff859fe1dc0da0f87bbdfff78f527898878fa4a Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+Date: Sun, 29 Dec 2013 12:39:50 +0000
+Subject: ARM: fix footbridge clockevent device
+
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+
+commit 4ff859fe1dc0da0f87bbdfff78f527898878fa4a upstream.
+
+The clockevents code was being told that the footbridge clock event
+device ticks at 16x the rate which it actually does.  This leads to
+timekeeping problems since it allows the clocksource to wrap before
+the kernel notices.  Fix this by using the correct clock.
+
+Fixes: 4e8d76373c9fd ("ARM: footbridge: convert to clockevents/clocksource")
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mach-footbridge/dc21285-timer.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/mach-footbridge/dc21285-timer.c
++++ b/arch/arm/mach-footbridge/dc21285-timer.c
+@@ -96,11 +96,12 @@ static struct irqaction footbridge_timer
+ void __init footbridge_timer_init(void)
+ {
+ 	struct clock_event_device *ce = &ckevt_dc21285;
++	unsigned rate = DIV_ROUND_CLOSEST(mem_fclk_21285, 16);
+ 
+-	clocksource_register_hz(&cksrc_dc21285, (mem_fclk_21285 + 8) / 16);
++	clocksource_register_hz(&cksrc_dc21285, rate);
+ 
+ 	setup_irq(ce->irq, &footbridge_timer_irq);
+ 
+ 	ce->cpumask = cpumask_of(smp_processor_id());
+-	clockevents_config_and_register(ce, mem_fclk_21285, 0x4, 0xffffff);
++	clockevents_config_and_register(ce, rate, 0x4, 0xffffff);
+ }
diff --git a/queue-3.10/series b/queue-3.10/series
index ca90f026d6e..b874c323d89 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -35,3 +35,5 @@ net-llc-fix-use-after-free-in-llc_ui_recvmsg.patch
 netpoll-fix-missing-txq-unlock-and-and-oops.patch
 bridge-use-spin_lock_bh-in-br_multicast_set_hash_max.patch
 net-loosen-constraints-for-recalculating-checksum-in-skb_segment.patch
+arm-fix-footbridge-clockevent-device.patch
+arm-fix-bad-mode-in-...-handler-message-for-undefined-instructions.patch