From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 31 Oct 2011 09:22:22 +0000 (+0000)
Subject: ARM: restart: move reboot failure handing into machine_restart()
X-Git-Tag: sz_154~159
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12d5244c6a5238bde7453525209ac148f5073a33;p=pandora-kernel.git

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
---

Reading git-diff-tree failed