[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v3] ARM: xen: only set pm function ptrs for Xen guests
On Thu, 29 Aug 2013, Stefano Stabellini wrote: > On Thu, 29 Aug 2013, Rob Herring wrote: > > From: Rob Herring <rob.herring@xxxxxxxxxxx> > > > > 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. > > > > Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx> > > Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxx> > > > Acked-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx> > > Added to my queue. FYI we are going to send a pull request for this patch in the 3.12 merge window, asking for a backport to 3.11. > > > arch/arm/xen/enlighten.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > > index 8a6295c..7071fca 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) > > { > > -- > > 1.8.1.2 > > > _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |