aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/process.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kernel/process.c')
-rw-r--r--arch/arm/kernel/process.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index aaf51159203a..2e2ec97cc50c 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -198,19 +198,29 @@ int __init reboot_setup(char *str)
198 198
199__setup("reboot=", reboot_setup); 199__setup("reboot=", reboot_setup);
200 200
201void machine_halt(void) 201void machine_shutdown(void)
202{ 202{
203#ifdef CONFIG_SMP
204 smp_send_stop();
205#endif
203} 206}
204 207
208void machine_halt(void)
209{
210 machine_shutdown();
211 while (1);
212}
205 213
206void machine_power_off(void) 214void machine_power_off(void)
207{ 215{
216 machine_shutdown();
208 if (pm_power_off) 217 if (pm_power_off)
209 pm_power_off(); 218 pm_power_off();
210} 219}
211 220
212void machine_restart(char *cmd) 221void machine_restart(char *cmd)
213{ 222{
223 machine_shutdown();
214 arm_pm_restart(reboot_mode, cmd); 224 arm_pm_restart(reboot_mode, cmd);
215} 225}
216 226