The patch titled Subject: power/restart: call machine_restart instead of arm_pm_restart has been added to the -mm tree. Its filename is power-restart-call-machine_restart-instead-of-arm_pm_restart.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/power-restart-call-machine_restart-instead-of-arm_pm_restart.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/power-restart-call-machine_restart-instead-of-arm_pm_restart.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Guenter Roeck <linux@xxxxxxxxxxxx> Subject: 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@xxxxxxxxxxxx> Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx> Acked-by: Heiko Stuebner <heiko@xxxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Dmitry Eremin-Solenikov <dbaryshkov@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Jonas Jensen <jonas.jensen@xxxxxxxxx> Cc: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: Tomasz Figa <t.figa@xxxxxxxxxxx> Cc: Will Deacon <will.deacon@xxxxxxx> Cc: Wim Van Sebroeck <wim@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/power/reset/restart-poweroff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/power/reset/restart-poweroff.c~power-restart-call-machine_restart-instead-of-arm_pm_restart drivers/power/reset/restart-poweroff.c --- a/drivers/power/reset/restart-poweroff.c~power-restart-call-machine_restart-instead-of-arm_pm_restart +++ a/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) _ Patches currently in -mm which might be from linux@xxxxxxxxxxxx are kernel-add-support-for-kernel-restart-handler-call-chain.patch power-restart-call-machine_restart-instead-of-arm_pm_restart.patch arm64-support-restart-through-restart-handler-call-chain.patch arm-support-restart-through-restart-handler-call-chain.patch watchdog-moxart-register-restart-handler-with-kernel-restart-handler.patch watchdog-alim7101-register-restart-handler-with-kernel-restart-handler.patch watchdog-sunxi-register-restart-handler-with-kernel-restart-handler.patch arm-arm64-unexport-restart-handlers.patch watchdog-s3c2410-add-restart-handler.patch clk-samsung-register-restart-handlers-for-s3c2412-and-s3c2443.patch clk-rockchip-add-restart-handler.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html