diff --git a/0001-arm64-kernel-numa-fix-ACPI-boot-cpu-numa-node-mappin.patch b/0001-arm64-kernel-numa-fix-ACPI-boot-cpu-numa-node-mappin.patch index bfe4c9630..7be04148c 100644 --- a/0001-arm64-kernel-numa-fix-ACPI-boot-cpu-numa-node-mappin.patch +++ b/0001-arm64-kernel-numa-fix-ACPI-boot-cpu-numa-node-mappin.patch @@ -1,7 +1,20 @@ -From 23339319c91c79986976381d4cea75f6608dee68 Mon Sep 17 00:00:00 2001 +From patchwork Mon Oct 17 14:56:49 2016 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v2] arm64: kernel: numa: fix ACPI boot cpu numa node mapping From: Lorenzo Pieralisi -Date: Mon, 17 Oct 2016 15:18:48 +0100 -Subject: [PATCH] arm64: kernel: numa: fix ACPI boot cpu numa node mapping +X-Patchwork-Id: 9379531 +Message-Id: <20161017145649.6189-1-lorenzo.pieralisi@arm.com> +To: linux-arm-kernel@lists.infradead.org +Cc: Andrew Jones , + Lorenzo Pieralisi , + Catalin Marinas , + Will Deacon , + linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, + Hanjun Guo , + Zhen Lei , Laszlo Ersek +Date: Mon, 17 Oct 2016 15:56:49 +0100 Commit 7ba5f605f3a0 ("arm64/numa: remove the limitation that cpu0 must bind to node0") removed the numa cpu<->node mapping restriction whereby @@ -9,8 +22,8 @@ logical cpu 0 always corresponds to numa node 0; removing the restriction was correct, in that it does not really exist in practice but the commit only updated the early mapping of logical cpu 0 to its real numa node for the DT boot path, missing the ACPI one, leading to -boot failures on ACPI systems with numa enabled owing to missing -node<->cpu map for logical cpu 0. +boot failures on ACPI systems owing to missing cpu<->node map for +logical cpu 0. Fix the issue by updating the ACPI boot path with code that carries out the early cpu<->node mapping also for the boot cpu (ie cpu 0), mirroring @@ -26,7 +39,11 @@ Cc: Hanjun Guo Cc: Andrew Jones Cc: Zhen Lei Cc: Catalin Marinas +Acked-by: Hanjun Guo --- +v1 -> v2 + - Updated commit log to reflect boot failures set-ups + arch/arm64/kernel/smp.c | 1 + 1 file changed, 1 insertion(+) @@ -42,6 +59,3 @@ index d3f151c..8507703 100644 return; } --- -2.7.4 - diff --git a/config-generic b/config-generic index 386cc8a27..42b48fc8f 100644 --- a/config-generic +++ b/config-generic @@ -5525,7 +5525,7 @@ CONFIG_LEDS_WM831X_STATUS=m # CONFIG_LEDS_LP5562 is not set # CONFIG_LEDS_LP55XX_COMMON is not set # CONFIG_LEDS_PM8058 is not set -# CONFIG_LEDS_MLXCPLD is not set +CONFIG_LEDS_MLXCPLD=m CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y diff --git a/gitrev b/gitrev index fb1cd70c6..c1b2f799e 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -14155cafeadda946376260e2ad5d39a0528a332f +1a1891d762d6e64daf07b5be4817e3fbb29e3c59 diff --git a/kernel.spec b/kernel.spec index 7d34b3a0d..00c8fc4d1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2147,6 +2147,11 @@ fi # # %changelog +* Wed Oct 19 2016 Laura Abbott - 4.9.0-0.rc1.git2.1 +- Linux v4.9-rc1-67-g1a1891d +- Switch to v2 of the aarch64 boot regression patch +- Enable CONFIG_LEDS_MLXCPLD per request on mailing list + * Tue Oct 18 2016 Laura Abbott - Gracefully bail out of secureboot when EFI runtime is disabled - Fix for aarch64 boot regression (rhbz 1384701) diff --git a/sources b/sources index b3dc5f08a..afea3950a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ c1af0afbd3df35c1ccdc7a5118cd2d07 linux-4.8.tar.xz 0dad03f586e835d538d3e0d2cbdb9a28 perf-man-4.8.tar.gz 57c8efbc183617e94a8367d03f752b4d patch-4.9-rc1.xz -4adbda8bf07e8d8e96f528baea003fc8 patch-4.9-rc1-git1.xz +d1ba8c2f46bcf5f829f2f16c4777dca2 patch-4.9-rc1-git2.xz