ARM: restart: move reboot failure handing into machine_restart()
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 31 Oct 2011 09:22:22 +0000 (09:22 +0000)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 20 Feb 2013 21:19:23 +0000 (23:19 +0200)
commit12d5244c6a5238bde7453525209ac148f5073a33
treee556787e618ca74d7659a312cfff52a23743def7
parent3ebe85db7c73746f6e7ae2ccb7c75250e1f0a906
ARM: restart: move reboot failure handing into machine_restart()

Move the failure to reboot into machine_restart() to always catch
this condition, even if a platform decides to hook the restarting
via arm_pm_restart().

Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Conflicts:

arch/arm/kernel/process.c
arch/arm/kernel/process.c