3.10-stable patches

added patches:
	arm-dts-imx27-only-map-4-kbyte-for-fec-registers.patch
	arm-fix-missing-syscall-trace-exit.patch

diff --git a/queue-3.10/arm-dts-imx27-only-map-4-kbyte-for-fec-registers.patch b/queue-3.10/arm-dts-imx27-only-map-4-kbyte-for-fec-registers.patch
new file mode 100644 (file)
index 0000000..8413555
--- /dev/null
+++ b/queue-3.10/arm-dts-imx27-only-map-4-kbyte-for-fec-registers.patch
@@ -0,0 +1,38 @@
+From a29ef819f3f34f89a1b9b6a939b4c1cdfe1e85ce Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tremyfr@gmail.com>
+Date: Wed, 13 May 2015 00:18:26 +0200
+Subject: ARM: dts: imx27: only map 4 Kbyte for fec registers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Philippe Reynes <tremyfr@gmail.com>
+
+commit a29ef819f3f34f89a1b9b6a939b4c1cdfe1e85ce upstream.
+
+According to the imx27 documentation, fec has a 4 Kbyte
+memory space map. Moreover, the actual 16 Kbyte mapping
+overlaps the SCC (Security Controller) memory register
+space. So, we reduce the memory register space to 4 Kbyte.
+
+Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
+Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Fixes: 9f0749e3eb88 ("ARM i.MX27: Add devicetree support")
+Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/imx27.dtsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/imx27.dtsi
++++ b/arch/arm/boot/dts/imx27.dtsi
+@@ -290,7 +290,7 @@
+ 
+                       fec: ethernet@1002b000 {
+                               compatible = "fsl,imx27-fec";
+-                              reg = <0x1002b000 0x4000>;
++                              reg = <0x1002b000 0x1000>;
+                               interrupts = <50>;
+                               clocks = <&clks 48>, <&clks 67>, <&clks 0>;
+                               clock-names = "ipg", "ahb", "ptp";

diff --git a/queue-3.10/arm-fix-missing-syscall-trace-exit.patch b/queue-3.10/arm-fix-missing-syscall-trace-exit.patch
new file mode 100644 (file)
index 0000000..3512abf
--- /dev/null
+++ b/queue-3.10/arm-fix-missing-syscall-trace-exit.patch
@@ -0,0 +1,40 @@
+From 1b97937246d8b97c0760d16d8992c7937bdf5e6a Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+Date: Fri, 15 May 2015 11:02:23 +0100
+Subject: ARM: fix missing syscall trace exit
+
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+
+commit 1b97937246d8b97c0760d16d8992c7937bdf5e6a upstream.
+
+Josh Stone reports:
+
+  I've discovered a case where both arm and arm64 will miss a ptrace
+  syscall-exit that they should report.  If the syscall is entered
+  without TIF_SYSCALL_TRACE set, then it goes on the fast path.  It's
+  then possible to have TIF_SYSCALL_TRACE added in the middle of the
+  syscall, but ret_fast_syscall doesn't check this flag again.
+
+Fix this by always checking for a syscall trace in the fast exit path.
+
+Reported-by: Josh Stone <jistone@redhat.com>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/kernel/entry-common.S |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/kernel/entry-common.S
++++ b/arch/arm/kernel/entry-common.S
+@@ -32,7 +32,9 @@ ret_fast_syscall:
+  UNWIND(.fnstart      )
+  UNWIND(.cantunwind   )
+       disable_irq                             @ disable interrupts
+-      ldr     r1, [tsk, #TI_FLAGS]
++      ldr     r1, [tsk, #TI_FLAGS]            @ re-check for syscall tracing
++      tst     r1, #_TIF_SYSCALL_WORK
++      bne     __sys_trace_return
+       tst     r1, #_TIF_WORK_MASK
+       bne     fast_work_pending
+       asm_trace_hardirqs_on

diff --git a/queue-3.10/series b/queue-3.10/series
index 751e77ddd1a1f0b4c901d98d39ece966e282dbb1..c27081c6dffb712485a53feb7480b3e018a2269a 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -35,3 +35,5 @@ libata-add-helper-to-determine-when-phy-events-should-be-ignored.patch
 libata-ignore-spurious-phy-event-on-lpm-policy-change.patch
 rt2x00-add-new-rt2800usb-device-dwa-130.patch
 crypto-s390-ghash-fix-incorrect-ghash-icv-buffer-handling.patch
+arm-dts-imx27-only-map-4-kbyte-for-fec-registers.patch
+arm-fix-missing-syscall-trace-exit.patch