Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755880Ab3H1VWe (ORCPT ); Wed, 28 Aug 2013 17:22:34 -0400 Received: from mail-vc0-f179.google.com ([209.85.220.179]:56615 "EHLO mail-vc0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754908Ab3H1VWd (ORCPT ); Wed, 28 Aug 2013 17:22:33 -0400 MIME-Version: 1.0 In-Reply-To: <1377714003-22096-1-git-send-email-robherring2@gmail.com> References: <1377714003-22096-1-git-send-email-robherring2@gmail.com> From: Julien Grall Date: Wed, 28 Aug 2013 22:22:02 +0100 Message-ID: Subject: Re: [PATCH v2] ARM: xen: only set pm function ptrs for Xen guests To: Rob Herring Cc: xen-devel@lists.xensource.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Rob Herring , Stefano Stabellini Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1313 Lines: 38 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. Cheers, -- Julien Grall -- 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/