diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-10 16:38:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-10 16:38:02 -0400 |
| commit | 93834c6419bccf102a17971c6b114826597a61c5 (patch) | |
| tree | 9fd665b797b0fe258f19c9ef0674564b1a4356f6 /drivers/power | |
| parent | c798360cd1438090d51eeaa8e67985da11362eba (diff) | |
| parent | 6cd6d94d96d9b1cd8a62da91aac44cf56e301e75 (diff) | |
| download | linux-93834c6419bccf102a17971c6b114826597a61c5.tar.bz2 | |
Merge tag 'restart-handler-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull restart handler infrastructure from Guenter Roeck:
"This series was supposed to be pulled through various trees using it,
and I did not plan to send a separate pull request. As it turns out,
the pinctrl tree did not merge with it, is now upstream, and uses it,
meaning there are now build failures.
Please pull this series directly to fix those build failures"
* tag 'restart-handler-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
arm/arm64: unexport restart handlers
watchdog: sunxi: register restart handler with kernel restart handler
watchdog: alim7101: register restart handler with kernel restart handler
watchdog: moxart: register restart handler with kernel restart handler
arm: support restart through restart handler call chain
arm64: support restart through restart handler call chain
power/restart: call machine_restart instead of arm_pm_restart
kernel: add support for kernel restart handler call chain
Diffstat (limited to 'drivers/power')
| -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) |