[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <53741A70.8090606@roeck-us.net>
Date: Wed, 14 May 2014 18:37:52 -0700
From: Guenter Roeck <linux@...ck-us.net>
To: linux-watchdog@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org
CC: Wim Van Sebroeck <wim@...ana.be>,
Catalin Marinas <catalin.marinas@....com>,
Maxime Ripard <maxime.ripard@...e-electrons.com>,
Will Deacon <will.deacon@....com>,
Arnd Bergmann <arnd@...db.de>,
Heiko Stuebner <heiko@...ech.de>,
Russell King <linux@....linux.org.uk>,
Jonas Jensen <jonas.jensen@...il.com>,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 3/5] arm: Support reboot through watchdog subsystem
On 05/09/2014 05:31 PM, Guenter Roeck wrote:
> 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.jensen@...il.com>
> Signed-off-by: Guenter Roeck <linux@...ck-us.net>
Any comments / ack from the arm maintainers ?
Thanks,
Guenter
> ---
> 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);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists