diff options
Diffstat (limited to 'arch/arm/mach-omap2/omap-smp.c')
-rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 6 |
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 2a551f997aea..98a11463a843 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c | |||
@@ -87,7 +87,7 @@ static int __cpuinit omap4_boot_secondary(unsigned int cpu, struct task_struct * | |||
87 | 87 | ||
88 | /* | 88 | /* |
89 | * Update the AuxCoreBoot0 with boot state for secondary core. | 89 | * Update the AuxCoreBoot0 with boot state for secondary core. |
90 | * omap_secondary_startup() routine will hold the secondary core till | 90 | * omap4_secondary_startup() routine will hold the secondary core till |
91 | * the AuxCoreBoot1 register is updated with cpu state | 91 | * the AuxCoreBoot1 register is updated with cpu state |
92 | * A barrier is added to ensure that write buffer is drained | 92 | * A barrier is added to ensure that write buffer is drained |
93 | */ | 93 | */ |
@@ -200,7 +200,7 @@ static void __init omap4_smp_init_cpus(void) | |||
200 | 200 | ||
201 | static void __init omap4_smp_prepare_cpus(unsigned int max_cpus) | 201 | static void __init omap4_smp_prepare_cpus(unsigned int max_cpus) |
202 | { | 202 | { |
203 | void *startup_addr = omap_secondary_startup; | 203 | void *startup_addr = omap4_secondary_startup; |
204 | void __iomem *base = omap_get_wakeupgen_base(); | 204 | void __iomem *base = omap_get_wakeupgen_base(); |
205 | 205 | ||
206 | /* | 206 | /* |
@@ -211,7 +211,7 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus) | |||
211 | scu_enable(scu_base); | 211 | scu_enable(scu_base); |
212 | 212 | ||
213 | if (cpu_is_omap446x()) { | 213 | if (cpu_is_omap446x()) { |
214 | startup_addr = omap_secondary_startup_4460; | 214 | startup_addr = omap4460_secondary_startup; |
215 | pm44xx_errata |= PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD; | 215 | pm44xx_errata |= PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD; |
216 | } | 216 | } |
217 | 217 | ||