Merge remote-tracking branch 'jc_docs/docs-next'

[karo-tx-linux.git] / arch / arm / mach-shmobile / smp-r8a7779.c

diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index b854fe2095ad14616b7c4aae209b47f7e4f7ded3..f5c31fbc10b2efbf3c341f9efbaa66f261c0f4d4 100644 (file)
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -92,12 +92,9 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
 {
        /* Map the reset vector (in headsmp-scu.S, headsmp.S) */
        __raw_writel(__pa(shmobile_boot_vector), AVECR);
-       shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);
-       shmobile_boot_arg = (unsigned long)shmobile_scu_base;
 
        /* setup r8a7779 specific SCU bits */
-       shmobile_scu_base = IOMEM(R8A7779_SCU_BASE);
-       shmobile_smp_scu_prepare_cpus(max_cpus);
+       shmobile_smp_scu_prepare_cpus(R8A7779_SCU_BASE, max_cpus);
 
        r8a7779_pm_init();