Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756412Ab3H2L25 (ORCPT ); Thu, 29 Aug 2013 07:28:57 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:65237 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752366Ab3H2L2z (ORCPT ); Thu, 29 Aug 2013 07:28:55 -0400 X-IronPort-AV: E=Sophos;i="4.89,983,1367971200"; d="scan'208";a="46362059" Date: Thu, 29 Aug 2013 12:28:43 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Julien Grall CC: Rob Herring , , , , Rob Herring , Stefano Stabellini Subject: Re: [PATCH v2] ARM: xen: only set pm function ptrs for Xen guests In-Reply-To: Message-ID: References: <1377714003-22096-1-git-send-email-robherring2@gmail.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-DLP: MIA2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1525 Lines: 39 On Wed, 28 Aug 2013, Julien Grall wrote: > On 28 August 2013 19:20, Rob Herring wrote: > > From: Rob Herring > > > > 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 > > Signed-off-by: Rob Herring > > --- > > 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. Yep. Aside from that the patch is fine. Thanks for spotting and fixing this issue. I'll add the next version of this patch to the xen queue. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/