diff options
Diffstat (limited to 'arch/arm/kernel/process.c')
| -rw-r--r-- | arch/arm/kernel/process.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 423bb201945..b29776aa658 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 | ||
| 150 | void arm_machine_restart(char mode, const char *cmd) | 150 | static 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) | |||
| 163 | void (*pm_power_off)(void); | 157 | void (*pm_power_off)(void); |
| 164 | EXPORT_SYMBOL(pm_power_off); | 158 | EXPORT_SYMBOL(pm_power_off); |
| 165 | 159 | ||
| 166 | void (*arm_pm_restart)(char str, const char *cmd) = arm_machine_restart; | 160 | void (*arm_pm_restart)(char str, const char *cmd) = null_restart; |
| 167 | EXPORT_SYMBOL_GPL(arm_pm_restart); | 161 | EXPORT_SYMBOL_GPL(arm_pm_restart); |
| 168 | 162 | ||
| 169 | static void do_nothing(void *unused) | 163 | static void do_nothing(void *unused) |
