From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755560AbaEAPmA (ORCPT ); Thu, 1 May 2014 11:42:00 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:51531 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbaEAPl6 (ORCPT ); Thu, 1 May 2014 11:41:58 -0400 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 , Russell King , Jonas Jensen , linux-kernel@vger.kernel.org, Guenter Roeck Subject: [RFC PATCH 3/5] arm: Support reboot through watchdog subsystem Date: Thu, 1 May 2014 08:41:31 -0700 Message-Id: <1398958893-30049-4-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1398958893-30049-1-git-send-email-linux@roeck-us.net> References: <1398958893-30049-1-git-send-email-linux@roeck-us.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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. Signed-off-by: Guenter Roeck --- 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.7.9.7