From: Rob Herring <rob.herr...@calxeda.com>
xen_pm_init was unconditionally setting pm_power_off and arm_pm_restart
function pointers. This breaks multi-platform kernels. Move this
initialization into xen_guest_init, so it is conditional on running as a
Xen guest.
Cc: Stefano Stabellini <stefano.stabell...@eu.citrix.com>
Signed-off-by: Rob Herring <rob.herr...@calxeda.com>
---
This breaks reset and poweroff for Midway when Xen is enabled. This
should go into 3.11 or stable.
Rob
arch/arm/xen/enlighten.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 8a6295c..fa86452 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -263,6 +263,9 @@ static int __init xen_guest_init(void)
if (xen_vcpu_info == NULL)
return -ENOMEM;
+ pm_power_off = xen_power_off;
+ arm_pm_restart = xen_restart;
+
gnttab_init();
if (!xen_initial_domain())
xenbus_probe(NULL);
@@ -271,15 +274,6 @@ static int __init xen_guest_init(void)
}
core_initcall(xen_guest_init);
-static int __init xen_pm_init(void)
-{
- pm_power_off = xen_power_off;
- arm_pm_restart = xen_restart;
-
- return 0;
-}
-subsys_initcall(xen_pm_init);
-
static irqreturn_t xen_arm_callback(int irq, void *arg)
{
xen_hvm_evtchn_do_upcall();
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
