summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorSebastian Reichel <sre@kernel.org>2014-09-26 19:45:11 +0200
committerSebastian Reichel <sre@kernel.org>2014-09-26 19:45:11 +0200
commit1670d8569eeb5c5c15776d37b00a2afb5255bf28 (patch)
tree874ed86799a9f7a256087c1138c7af35f7f1e9a1 /drivers/power
parentb08fec2262c8dbb349fe9456586cf0724407e5ee (diff)
parent6cd6d94d96d9b1cd8a62da91aac44cf56e301e75 (diff)
downloadop-kernel-dev-1670d8569eeb5c5c15776d37b00a2afb5255bf28.zip
op-kernel-dev-1670d8569eeb5c5c15776d37b00a2afb5255bf28.tar.gz
Merge tag 'tags/restart-handler-for-v3.18' into next
Immutable branch with restart handler patches for v3.18
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/reset/restart-poweroff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c
index 3e51f8d..edd707e 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)
OpenPOWER on IntegriCloud