| From 9dd4b2944c46e1fdbd0a516c221c8a2670cbf005 Mon Sep 17 00:00:00 2001 |
| From: Rob Herring <rob.herring@calxeda.com> |
| Date: Thu, 29 Aug 2013 07:43:52 -0500 |
| Subject: ARM: xen: only set pm function ptrs for Xen guests |
| |
| From: Rob Herring <rob.herring@calxeda.com> |
| |
| 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 | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- 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) |
| { |
