From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 21 Sep 2015 01:46:26 +0000 (-0700)
Subject: 4.2-stable patches
X-Git-Tag: v3.10.89~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87c2b2b9d7ca794ca6dd708ee6f5c204a6846749;p=thirdparty%2Fkernel%2Fstable-queue.git

4.2-stable patches

added patches:
	arm-rockchip-fix-broken-build.patch
---

diff --git a/queue-4.2/arm-rockchip-fix-broken-build.patch b/queue-4.2/arm-rockchip-fix-broken-build.patch
new file mode 100644
index 00000000000..093da5e8db0
--- /dev/null
+++ b/queue-4.2/arm-rockchip-fix-broken-build.patch
@@ -0,0 +1,47 @@
+From cb8cc37f4d38d96552f2c52deb15e511cdacf906 Mon Sep 17 00:00:00 2001
+From: Caesar Wang <wxt@rock-chips.com>
+Date: Mon, 6 Jul 2015 11:37:23 +0800
+Subject: ARM: rockchip: fix broken build
+
+From: Caesar Wang <wxt@rock-chips.com>
+
+commit cb8cc37f4d38d96552f2c52deb15e511cdacf906 upstream.
+
+The following was seen in branch[0] build.
+
+arch/arm/mach-rockchip/platsmp.c:154:23: error:
+    'rockchip_secondary_startup' undeclared (first use in this function)
+
+branch[0]:
+git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
+v4.3-armsoc/soc
+
+The broken build is caused by the commit fe4407c0dc58
+("ARM: rockchip: fix the CPU soft reset").
+
+Signed-off-by: Caesar Wang <wxt@rock-chips.com>
+
+The breakage was a result of it being wrongly merged in my branch with
+the cache invalidation rework from Russell 02b4e2756e01c
+("ARM: v7 setup function should invalidate L1 cache").
+
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Cc: Willy Tarreau <w@1wt.eu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mach-rockchip/platsmp.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/arch/arm/mach-rockchip/platsmp.c
++++ b/arch/arm/mach-rockchip/platsmp.c
+@@ -151,8 +151,7 @@ static int rockchip_boot_secondary(unsig
+ 		 * */
+ 		mdelay(1); /* ensure the cpus other than cpu0 to startup */
+ 
+-		writel(virt_to_phys(rockchip_secondary_startup),
+-			sram_base_addr + 8);
++		writel(virt_to_phys(secondary_startup), sram_base_addr + 8);
+ 		writel(0xDEADBEAF, sram_base_addr + 4);
+ 		dsb_sev();
+ 	}
diff --git a/queue-4.2/series b/queue-4.2/series
index 9d8ea1eebd6..0f436895a70 100644
--- a/queue-4.2/series
+++ b/queue-4.2/series
@@ -118,3 +118,4 @@ hpfs-update-ctime-and-mtime-on-directory-modification.patch
 ocfs2-direct-write-will-call-ocfs2_rw_unlock-twice-when-doing-aio-dio.patch
 memory-hotplug-add-hot-added-memory-ranges-to-memblock-before-allocate-node_data-for-a-node.patch
 fs-create-and-use-seq_show_option-for-escaping.patch
+arm-rockchip-fix-broken-build.patch