diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2014-09-26 00:03:16 +0000 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2014-09-26 00:00:11 -0700 |
| commit | 0713e143c943c4f14aa5db1903bdbfd1356a2bb3 (patch) | |
| tree | 969fc8786bc7e1a2ab526b0b2d84bca9070d2095 /drivers/power/reset/restart-poweroff.c | |
| parent | kernel: add support for kernel restart handler call chain (diff) | |
| download | linux-dev-0713e143c943c4f14aa5db1903bdbfd1356a2bb3.tar.xz linux-dev-0713e143c943c4f14aa5db1903bdbfd1356a2bb3.zip | |
power/restart: call machine_restart instead of arm_pm_restart
machine_restart is supported on non-ARM platforms, and and ultimately
calls arm_pm_restart, so dont call arm_pm_restart directly but use the
more generic function.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jonas Jensen <jonas.jensen@gmail.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/power/reset/restart-poweroff.c')
| -rw-r--r-- | drivers/power/reset/restart-poweroff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c index 3e51f8d29bfe..edd707ee7281 100644 --- a/drivers/power/reset/restart-poweroff.c +++ b/drivers/power/reset/restart-poweroff.c @@ -20,7 +20,8 @@ static void restart_poweroff_do_poweroff(void) { - arm_pm_restart(REBOOT_HARD, NULL); + reboot_mode = REBOOT_HARD; + machine_restart(NULL); } static int restart_poweroff_probe(struct platform_device *pdev) |