From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Return-Path: Sender: Guenter Roeck From: Guenter Roeck To: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Wim Van Sebroeck , Catalin Marinas , Maxime Ripard , Will Deacon , Arnd Bergmann , Heiko Stuebner , Russell King , Jonas Jensen , linux-kernel@vger.kernel.org, Guenter Roeck Subject: [PATCH v2 3/5] arm: Support reboot through watchdog subsystem Date: Fri, 9 May 2014 17:31:21 -0700 Message-Id: <1399681883-891-4-git-send-email-linux@roeck-us.net> In-Reply-To: <1399681883-891-1-git-send-email-linux@roeck-us.net> References: <1399681883-891-1-git-send-email-linux@roeck-us.net> List-ID: 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 --- 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 #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(reboot_mode, cmd); /* Give a grace period for failure to restart of 1s */ mdelay(1000); -- 1.9.1