[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAPnVf8xczxPDucWMPcJ-Rre9uBXWAtHA0NkT62xu5ZghvpsFRg@mail.gmail.com>
Date: Wed, 28 Aug 2013 22:22:02 +0100
From: Julien Grall <julien.grall@...aro.org>
To: Rob Herring <robherring2@...il.com>
Cc: xen-devel@...ts.xensource.com,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Rob Herring <rob.herring@...xeda.com>,
Stefano Stabellini <stefano.stabellini@...citrix.com>
Subject: Re: [PATCH v2] ARM: xen: only set pm function ptrs for Xen guests
On 28 August 2013 19:20, Rob Herring <robherring2@...il.com> wrote:
> From: Rob Herring <rob.herring@...xeda.com>
>
> 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@...citrix.com>
> Signed-off-by: Rob Herring <rob.herring@...xeda.com>
> ---
> 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..13a7d1f 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 (!of_find_compatible_node(NULL, NULL, "xen,xen"))
> + return -ENODEV;
> +
You should use the macro xen_domain() to check if we are running
in a Xen guest.
Cheers,
--
Julien Grall
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists