From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@roeck-us.net (Guenter Roeck) Date: Thu, 15 May 2014 13:38:22 -0700 Subject: [PATCH v3 4/6] arm: Support reboot through watchdog subsystem In-Reply-To: <1400186304-1691-1-git-send-email-linux@roeck-us.net> References: <1400186304-1691-1-git-send-email-linux@roeck-us.net> Message-ID: <1400186304-1691-5-git-send-email-linux@roeck-us.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 Signed-off-by: Guenter Roeck --- v3: Drop reboot mode and cmd string parameters from API 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..4bfbedc 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -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(); /* Give a grace period for failure to restart of 1s */ mdelay(1000); -- 1.9.1