Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dd4b294 authored by Rob Herring's avatar Rob Herring Committed by Stefano Stabellini
Browse files

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: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: stable@vger.kernel.org
parent 23b7eaf8

arch/arm/xen/enlighten.c

+4 −1
Original line number Diff line number Diff line
@@ -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)

{