]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ARM: xen: only set pm function ptrs for Xen guests
authorRob Herring <rob.herring@calxeda.com>
Thu, 29 Aug 2013 12:43:52 +0000 (07:43 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Sep 2013 00:18:02 +0000 (17:18 -0700)
commit863008a9b50259d3a4b1c9a387804f9509413de4
tree43f83f4e588fa21e07bd521f4af381720c8b224b
parent93326685f124a1b2a71843b1c41328be13f97bbb
ARM: xen: only set pm function ptrs for Xen guests

commit 9dd4b2944c46e1fdbd0a516c221c8a2670cbf005 upstream.

xen_pm_init was unconditionally setting pm_power_off and arm_pm_restart
function pointers. This breaks multi-platform kernels. Make this
conditional on running as a Xen guest and make it a late_initcall to
ensure it is setup after platform code for Dom0.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/xen/enlighten.c