From: Greg Kroah-Hartman Date: Wed, 3 Jun 2015 03:24:24 +0000 (+0900) Subject: 3.14-stable patches X-Git-Tag: v3.10.80~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17eb07961d2d43d0e8fd3391b9a84a6d6457861f;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: arm-dts-imx27-only-map-4-kbyte-for-fec-registers.patch arm-fix-missing-syscall-trace-exit.patch mm-numa-really-disable-numa-balancing-by-default-on-single-node-machines.patch tools-vm-fix-page-flags-build.patch --- diff --git a/queue-3.14/arm-dts-imx27-only-map-4-kbyte-for-fec-registers.patch b/queue-3.14/arm-dts-imx27-only-map-4-kbyte-for-fec-registers.patch new file mode 100644 index 00000000000..7ac9c4fc786 --- /dev/null +++ b/queue-3.14/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 +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 + +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 +Acked-by: Uwe Kleine-König +Fixes: 9f0749e3eb88 ("ARM i.MX27: Add devicetree support") +Signed-off-by: Shawn Guo +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -428,7 +428,7 @@ + + fec: ethernet@1002b000 { + compatible = "fsl,imx27-fec"; +- reg = <0x1002b000 0x4000>; ++ reg = <0x1002b000 0x1000>; + interrupts = <50>; + clocks = <&clks 48>, <&clks 67>; + clock-names = "ipg", "ahb"; diff --git a/queue-3.14/arm-fix-missing-syscall-trace-exit.patch b/queue-3.14/arm-fix-missing-syscall-trace-exit.patch new file mode 100644 index 00000000000..3512abf2327 --- /dev/null +++ b/queue-3.14/arm-fix-missing-syscall-trace-exit.patch @@ -0,0 +1,40 @@ +From 1b97937246d8b97c0760d16d8992c7937bdf5e6a Mon Sep 17 00:00:00 2001 +From: Russell King +Date: Fri, 15 May 2015 11:02:23 +0100 +Subject: ARM: fix missing syscall trace exit + +From: Russell King + +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 +Signed-off-by: Russell King +Signed-off-by: Greg Kroah-Hartman + +--- + 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.14/mm-numa-really-disable-numa-balancing-by-default-on-single-node-machines.patch b/queue-3.14/mm-numa-really-disable-numa-balancing-by-default-on-single-node-machines.patch new file mode 100644 index 00000000000..5a61971adfd --- /dev/null +++ b/queue-3.14/mm-numa-really-disable-numa-balancing-by-default-on-single-node-machines.patch @@ -0,0 +1,49 @@ +From b0dc2b9bb4ab782115b964310518ee0b17784277 Mon Sep 17 00:00:00 2001 +From: Mel Gorman +Date: Thu, 14 May 2015 15:17:09 -0700 +Subject: mm, numa: really disable NUMA balancing by default on single node machines + +From: Mel Gorman + +commit b0dc2b9bb4ab782115b964310518ee0b17784277 upstream. + +NUMA balancing is meant to be disabled by default on UMA machines but +the check is using nr_node_ids (highest node) instead of +num_online_nodes (online nodes). + +The consequences are that a UMA machine with a node ID of 1 or higher +will enable NUMA balancing. This will incur useless overhead due to +minor faults with the impact depending on the workload. These are the +impact on the stats when running a kernel build on a single node machine +whose node ID happened to be 1: + + vanilla patched + NUMA base PTE updates 5113158 0 + NUMA huge PMD updates 643 0 + NUMA page range updates 5442374 0 + NUMA hint faults 2109622 0 + NUMA hint local faults 2109622 0 + NUMA hint local percent 100 100 + NUMA pages migrated 0 0 + +Signed-off-by: Mel Gorman +Reviewed-by: Rik van Riel +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/mempolicy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mm/mempolicy.c ++++ b/mm/mempolicy.c +@@ -2663,7 +2663,7 @@ static void __init check_numabalancing_e + if (numabalancing_override) + set_numabalancing_state(numabalancing_override == 1); + +- if (nr_node_ids > 1 && !numabalancing_override) { ++ if (num_online_nodes() > 1 && !numabalancing_override) { + pr_info("%s automatic NUMA balancing. " + "Configure with numa_balancing= or the " + "kernel.numa_balancing sysctl", diff --git a/queue-3.14/series b/queue-3.14/series index 2c9e6ab89b8..0bc47793ef6 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -44,3 +44,7 @@ rt2x00-add-new-rt2800usb-device-dwa-130.patch gpio-gpio-kempld-fix-get_direction-return-value.patch crypto-s390-ghash-fix-incorrect-ghash-icv-buffer-handling.patch mac80211-move-wep-tailroom-size-check.patch +arm-dts-imx27-only-map-4-kbyte-for-fec-registers.patch +arm-fix-missing-syscall-trace-exit.patch +tools-vm-fix-page-flags-build.patch +mm-numa-really-disable-numa-balancing-by-default-on-single-node-machines.patch diff --git a/queue-3.14/tools-vm-fix-page-flags-build.patch b/queue-3.14/tools-vm-fix-page-flags-build.patch new file mode 100644 index 00000000000..9c984b4b53f --- /dev/null +++ b/queue-3.14/tools-vm-fix-page-flags-build.patch @@ -0,0 +1,32 @@ +From 4933f55fe72c86e57efc454dd6e673c7f17af5a3 Mon Sep 17 00:00:00 2001 +From: Andi Kleen +Date: Thu, 14 May 2015 15:16:53 -0700 +Subject: tools/vm: fix page-flags build + +From: Andi Kleen + +commit 4933f55fe72c86e57efc454dd6e673c7f17af5a3 upstream. + +libabikfs.a doesn't exist anymore, so we now need to link with libapi.a. + +Signed-off-by: Andi Kleen +Cc: Naoya Horiguchi +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + tools/vm/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/vm/Makefile ++++ b/tools/vm/Makefile +@@ -3,7 +3,7 @@ + TARGETS=page-types slabinfo + + LIB_DIR = ../lib/api +-LIBS = $(LIB_DIR)/libapikfs.a ++LIBS = $(LIB_DIR)/libapi.a + + CC = $(CROSS_COMPILE)gcc + CFLAGS = -Wall -Wextra -I../lib/