Skip to content

Commit

Permalink
ARM: rockchip: fix broken build
Browse files Browse the repository at this point in the history
commit cb8cc37 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 fe4407c
("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 02b4e27
("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>
  • Loading branch information
Caesar Wang authored and Greg Kroah-Hartman committed Sep 21, 2015
1 parent c529120 commit 896b4f1
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/arm/mach-rockchip/platsmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,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();
}
Expand Down

0 comments on commit 896b4f1

Please sign in to comment.