Commit 77798915 authored by Caesar Wang's avatar Caesar Wang Committed by Greg Kroah-Hartman

ARM: rockchip: fix broken build

commit cb8cc37f 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 fe4407c0
("ARM: rockchip: fix the CPU soft reset").
Signed-off-by: default avatarCaesar 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 02b4e275
("ARM: v7 setup function should invalidate L1 cache").
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Cc: Willy Tarreau <w@1wt.eu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3b428f0
...@@ -152,8 +152,7 @@ static int __cpuinit rockchip_boot_secondary(unsigned int cpu, ...@@ -152,8 +152,7 @@ static int __cpuinit rockchip_boot_secondary(unsigned int cpu,
* */ * */
mdelay(1); /* ensure the cpus other than cpu0 to startup */ mdelay(1); /* ensure the cpus other than cpu0 to startup */
writel(virt_to_phys(rockchip_secondary_startup), writel(virt_to_phys(secondary_startup), sram_base_addr + 8);
sram_base_addr + 8);
writel(0xDEADBEAF, sram_base_addr + 4); writel(0xDEADBEAF, sram_base_addr + 4);
dsb_sev(); dsb_sev();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment