diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-05-16 08:27:49 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-05-16 08:27:49 -0700 |
| commit | 49a34fd5380d249ae8a2173399c62fc5a1fddd70 (patch) | |
| tree | f0247fb2116d2775c01a8a5a316195df696b7c3e /arch/arm/mach-omap2/omap-smp.c | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
| parent | 705814b5ea6ff69d4da8ad581c3da5d26d1eae83 (diff) | |
| download | blackbird-op-linux-49a34fd5380d249ae8a2173399c62fc5a1fddd70.tar.gz blackbird-op-linux-49a34fd5380d249ae8a2173399c62fc5a1fddd70.zip | |
Merge tag 'omap-pm-v3.10/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm
OMAP PM cleanups for v3.10
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 * /* * Update the AuxCoreBoot0 with boot state for secondary core. - * omap_secondary_startup() routine will hold the secondary core till + * omap4_secondary_startup() routine will hold the secondary core till * the AuxCoreBoot1 register is updated with cpu state * A barrier is added to ensure that write buffer is drained */ @@ -200,7 +200,7 @@ static void __init omap4_smp_init_cpus(void) static void __init omap4_smp_prepare_cpus(unsigned int max_cpus) { - void *startup_addr = omap_secondary_startup; + void *startup_addr = omap4_secondary_startup; void __iomem *base = omap_get_wakeupgen_base(); /* @@ -211,7 +211,7 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus) scu_enable(scu_base); if (cpu_is_omap446x()) { - startup_addr = omap_secondary_startup_4460; + startup_addr = omap4460_secondary_startup; pm44xx_errata |= PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD; } |
