ARM: rockchip: fix broken build
authorCaesar Wang <wxt@rock-chips.com>
Mon, 6 Jul 2015 03:37:23 +0000 (11:37 +0800)
committerHeiko Stuebner <heiko@sntech.de>
Mon, 6 Jul 2015 09:46:08 +0000 (11:46 +0200)
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>
arch/arm/mach-rockchip/platsmp.c

index 7ebd1c1a98c6d5f56481c88f029adcbe57487779..3e7a4b761a953fc2e494afb4c89bfd2de5c477d1 100644 (file)
@@ -152,8 +152,7 @@ static int rockchip_boot_secondary(unsigned int cpu, struct task_struct *idle)
                 */
                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();
        }