From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: Re: [patch v11 19/23] XEN / ACPI: Make XEN ACPI depend on X86 Date: Tue, 24 Mar 2015 17:24:53 +0000 Message-ID: References: <1427205776-5060-1-git-send-email-hanjun.guo@linaro.org> <1427205776-5060-20-git-send-email-hanjun.guo@linaro.org> <55118303.8060003@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Return-path: Received: from smtp.citrix.com ([66.165.176.89]:12058 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753886AbbCXR0I (ORCPT ); Tue, 24 Mar 2015 13:26:08 -0400 In-Reply-To: <55118303.8060003@oracle.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Boris Ostrovsky Cc: Hanjun Guo , Catalin Marinas , "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely , Lorenzo Pieralisi , Arnd Bergmann , Mark Rutland , Graeme Gregory , Sudeep Holla , Jon Masters , Marc Zyngier , Mark Brown , Robert Richter , Timur Tabi , Ashwin Chaugule , Suravee Suthikulpanit , Mark Salter , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, 'Stefano On Tue, 24 Mar 2015, Boris Ostrovsky wrote: > On 03/24/2015 10:02 AM, Hanjun Guo wrote: > > When ACPI is enabled on ARM64, XEN ACPI will also compiled > > into the kernel, but XEN ACPI is x86 dependent, so introduce > > CONFIG_XEN_ACPI to make it depend on x86 before XEN ACPI is > > functional on ARM64. > > > > CC: 'Stefano Stabellini' > > CC: Julien Grall > > CC: Konrad Rzeszutek Wilk > > CC: Boris Ostrovsky > > CC: David Vrabel > > Signed-off-by: Hanjun Guo > > --- > > drivers/xen/Kconfig | 4 ++++ > > drivers/xen/Makefile | 2 +- > > 2 files changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig > > index b812462..a31cd29 100644 > > --- a/drivers/xen/Kconfig > > +++ b/drivers/xen/Kconfig > > @@ -253,4 +253,8 @@ config XEN_EFI > > def_bool y > > depends on X86_64 && EFI > > +config XEN_ACPI > > + def_bool y > > + depends on X86 && ACPI > > + > > > I think XEN_DOM0 (in arch/x86/xen/Kconfig) should select this option. > Otherwise, if it is set to 'n', we won't be able to build enlighten.c > (xen_start_kernel() -> xen_acpi_sleep_register() refers to > xen_acpi_notify_hypervisor_sleep()). > I don't think that it is necessary: XEN_ACPI gets automatically enabled anyway. > > endmenu > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > > index 2ccd359..f4622ab 100644 > > --- a/drivers/xen/Makefile > > +++ b/drivers/xen/Makefile > > @@ -13,7 +13,7 @@ CFLAGS_efi.o += > > -fshort-wchar > > dom0-$(CONFIG_PCI) += pci.o > > dom0-$(CONFIG_USB_SUPPORT) += dbgp.o > > -dom0-$(CONFIG_ACPI) += acpi.o $(xen-pad-y) > > +dom0-$(CONFIG_XEN_ACPI) += acpi.o $(xen-pad-y) > > xen-pad-$(CONFIG_X86) += xen-acpi-pad.o > > dom0-$(CONFIG_X86) += pcpu.o > > obj-$(CONFIG_XEN_DOM0) += $(dom0-y) >