diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-08-29 07:43:52 -0500 |
---|---|---|
committer | Tushar Behera <tushar.behera@linaro.org> | 2013-09-30 09:03:55 +0530 |
commit | f76736d5740254ab5eea1cbba5bf788a7d36ec08 (patch) | |
tree | 218e3962df311681e4d08c88a64e3a9b0007ab90 | |
parent | a838eea9bdfd04ac27f91dbd33a046bd60c64c2c (diff) |
ARM: xen: only set pm function ptrs for Xen guestssamsung-lt-v3.11-2
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
-rw-r--r-- | arch/arm/xen/enlighten.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 8a6295c8620..7071fcac286 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -273,12 +273,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) { |