diff options
| -rw-r--r-- | arch/arm/mach-tegra/hotplug.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/sleep-t2.S | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/sleep.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c index 88c664f7dfad..a0b99b87cda8 100644 --- a/arch/arm/mach-tegra/hotplug.c +++ b/arch/arm/mach-tegra/hotplug.c @@ -57,7 +57,7 @@ void platform_cpu_die(unsigned int cpu) #ifdef CONFIG_ARCH_TEGRA_2x_SOC /* Place the current CPU in reset. */ - tegra2_sleep_reset(); + tegra2_hotplug_shutdown(); #endif /* diff --git a/arch/arm/mach-tegra/sleep-t2.S b/arch/arm/mach-tegra/sleep-t2.S index aacf630db2b2..9daf61a76ea4 100644 --- a/arch/arm/mach-tegra/sleep-t2.S +++ b/arch/arm/mach-tegra/sleep-t2.S @@ -73,12 +73,12 @@ #ifdef CONFIG_HOTPLUG_CPU /* - * tegra2_sleep_reset(void) + * tegra2_hotplug_shutdown(void) * * puts the current cpu in reset * should never return */ -ENTRY(tegra2_sleep_reset) +ENTRY(tegra2_hotplug_shutdown) cpu_id r0 /* Exit coherency. */ @@ -97,7 +97,7 @@ ENTRY(tegra2_sleep_reset) /* Put this CPU into reset. */ bl tegra2_cpu_reset mov pc, lr -ENDPROC(tegra2_sleep_reset) +ENDPROC(tegra2_hotplug_shutdown) #endif #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_PM_SLEEP) diff --git a/arch/arm/mach-tegra/sleep.h b/arch/arm/mach-tegra/sleep.h index 61ea3dfaffec..30fc2e5e245c 100644 --- a/arch/arm/mach-tegra/sleep.h +++ b/arch/arm/mach-tegra/sleep.h @@ -94,7 +94,7 @@ int tegra2_cpu_is_resettable_soon(void); void tegra2_cpu_reset(int cpu); void tegra2_cpu_set_resettable_soon(void); void tegra2_sleep_core(unsigned long v2p); -void tegra2_sleep_reset(void); +void tegra2_hotplug_shutdown(void); void tegra2_sleep_wfi(unsigned long v2p); #endif |