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.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 423bb2019451..b29776aa6586 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -147,14 +147,8 @@ void soft_restart(unsigned long addr)
147 BUG(); 147 BUG();
148} 148}
149 149
150void arm_machine_restart(char mode, const char *cmd) 150static void null_restart(char mode, const char *cmd)
151{ 151{
152 /* Disable interrupts first */
153 local_irq_disable();
154 local_fiq_disable();
155
156 /* Call the architecture specific reboot code. */
157 arch_reset(mode, cmd);
158} 152}
159 153
160/* 154/*
@@ -163,7 +157,7 @@ void arm_machine_restart(char mode, const char *cmd)
163void (*pm_power_off)(void); 157void (*pm_power_off)(void);
164EXPORT_SYMBOL(pm_power_off); 158EXPORT_SYMBOL(pm_power_off);
165 159
166void (*arm_pm_restart)(char str, const char *cmd) = arm_machine_restart; 160void (*arm_pm_restart)(char str, const char *cmd) = null_restart;
167EXPORT_SYMBOL_GPL(arm_pm_restart); 161EXPORT_SYMBOL_GPL(arm_pm_restart);
168 162
169static void do_nothing(void *unused) 163static void do_nothing(void *unused)