aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/omap-smp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/omap-smp.c')
-rw-r--r--arch/arm/mach-omap2/omap-smp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
index 0cbb677c4df4..5b201653ca32 100644
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
@@ -93,7 +93,7 @@ static int __cpuinit omap4_boot_secondary(unsigned int cpu, struct task_struct *
93 93
94 /* 94 /*
95 * Update the AuxCoreBoot0 with boot state for secondary core. 95 * Update the AuxCoreBoot0 with boot state for secondary core.
96 * omap_secondary_startup() routine will hold the secondary core till 96 * omap4_secondary_startup() routine will hold the secondary core till
97 * the AuxCoreBoot1 register is updated with cpu state 97 * the AuxCoreBoot1 register is updated with cpu state
98 * A barrier is added to ensure that write buffer is drained 98 * A barrier is added to ensure that write buffer is drained
99 */ 99 */
@@ -199,7 +199,7 @@ static void __init omap4_smp_init_cpus(void)
199 199
200static void __init omap4_smp_prepare_cpus(unsigned int max_cpus) 200static void __init omap4_smp_prepare_cpus(unsigned int max_cpus)
201{ 201{
202 void *startup_addr = omap_secondary_startup; 202 void *startup_addr = omap4_secondary_startup;
203 void __iomem *base = omap_get_wakeupgen_base(); 203 void __iomem *base = omap_get_wakeupgen_base();
204 204
205 /* 205 /*
@@ -210,7 +210,7 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus)
210 scu_enable(scu_base); 210 scu_enable(scu_base);
211 211
212 if (cpu_is_omap446x()) { 212 if (cpu_is_omap446x()) {
213 startup_addr = omap_secondary_startup_4460; 213 startup_addr = omap4460_secondary_startup;
214 pm44xx_errata |= PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD; 214 pm44xx_errata |= PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD;
215 } 215 }
216 216