summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-08-29 07:43:52 -0500
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2013-09-09 10:50:26 +0000
commit9dd4b2944c46e1fdbd0a516c221c8a2670cbf005 (patch)
treeb60f541e77d6195286502b41c5d5b04ca50b1b5c /arch
parent23b7eaf8220721892975610dd0ae5c846a34dcb4 (diff)
downloadlinux-9dd4b2944c46e1fdbd0a516c221c8a2670cbf005.tar.bz2
ARM: xen: only set pm function ptrs for Xen guests
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> CC: stable@vger.kernel.org
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/xen/enlighten.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index c9770ba5c7df..e70ce04e9dad 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -272,12 +272,15 @@ core_initcall(xen_guest_init);
static int __init xen_pm_init(void)
{
+ if (!xen_domain())
+ return -ENODEV;
+
pm_power_off = xen_power_off;
arm_pm_restart = xen_restart;
return 0;
}
-subsys_initcall(xen_pm_init);
+late_initcall(xen_pm_init);
static irqreturn_t xen_arm_callback(int irq, void *arg)
{