The watchdog subsystem provides an API to perform a system reboot.
Use it.
With this change, the arm_pm_restart callback is now optional,
so check if it is set before calling it.
Tested-by: Jonas Jensen <jonas.jen...@gmail.com>
Signed-off-by: Guenter Roeck <li...@roeck-us.net>
---
v2: No change
arch/arm/kernel/process.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 81ef686..c3b7b5e 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -32,6 +32,7 @@
#include <linux/hw_breakpoint.h>
#include <linux/leds.h>
#include <linux/reboot.h>
+#include <linux/watchdog.h>
#include <asm/cacheflush.h>
#include <asm/idmap.h>
@@ -230,7 +231,10 @@ void machine_restart(char *cmd)
local_irq_disable();
smp_send_stop();
- arm_pm_restart(reboot_mode, cmd);
+ if (arm_pm_restart)
+ arm_pm_restart(reboot_mode, cmd);
+
+ watchdog_do_reboot(reboot_mode, cmd);
/* Give a grace period for failure to restart of 1s */
mdelay(1000);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
