From patchwork Tue Mar 24 14:02:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 46256 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F21A4214B0 for ; Tue, 24 Mar 2015 14:07:27 +0000 (UTC) Received: by wibbs8 with SMTP id bs8sf13092942wib.3 for ; Tue, 24 Mar 2015 07:07:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=f9jd+OE27ImBTBaolmo9pCQMnUFTkkF+SPtrNHcDEYE=; b=Lh44FqMI33BS609Zn1oeNoLFoAvQPcvcrJBD8pu7mNoJwirGS38yAfSNNxb0KWmmPt dvMgeKvY/2tuW1Jr5MN39i/LYNlqWTH/O9OP4QmAlwtZAt5kqGU08P6tU/f8953h/GIx 640fF2DMcNPiQVfGiOGKL7AAWnYCPV1Z209sD9+TQdkG3Lb0HSw6bkmWKNT/b9X0R8JM QOttvmLYBaaMBHmenuc6XYZS7a/Rh0SaEtqG22YA7/Gv11bauTf2tzp/7wYQh/+IVxos D6VoaJ3feU7Qp1glKCp8z4jMZVK/WyksoldSiXOY/2yB7tiMXHRdvXTiYLj1DRnpdTTI 5PpQ== X-Gm-Message-State: ALoCoQmdSN/RSTTImJvqwTXm9uMpQOKAs0GIF2wJ3o1nw9t3BIQjOHbLf8Jht01Q6ZRByD3DErLf X-Received: by 10.152.20.41 with SMTP id k9mr918513lae.10.1427206047229; Tue, 24 Mar 2015 07:07:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.163 with SMTP id az3ls742623lab.64.gmail; Tue, 24 Mar 2015 07:07:27 -0700 (PDT) X-Received: by 10.112.17.8 with SMTP id k8mr4001486lbd.26.1427206047058; Tue, 24 Mar 2015 07:07:27 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id ar8si3121912lbc.48.2015.03.24.07.07.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Mar 2015 07:07:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by laae1 with SMTP id e1so28220372laa.2 for ; Tue, 24 Mar 2015 07:07:26 -0700 (PDT) X-Received: by 10.152.178.197 with SMTP id da5mr4087298lac.56.1427206046827; Tue, 24 Mar 2015 07:07:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.57.201 with SMTP id k9csp1475557lbq; Tue, 24 Mar 2015 07:07:25 -0700 (PDT) X-Received: by 10.66.147.103 with SMTP id tj7mr7857950pab.85.1427206044866; Tue, 24 Mar 2015 07:07:24 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vd5si5685203pbc.153.2015.03.24.07.07.23; Tue, 24 Mar 2015 07:07:24 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932070AbbCXOHT (ORCPT + 27 others); Tue, 24 Mar 2015 10:07:19 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34855 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753284AbbCXOFk (ORCPT ); Tue, 24 Mar 2015 10:05:40 -0400 Received: by pagv19 with SMTP id v19so51790402pag.2 for ; Tue, 24 Mar 2015 07:05:39 -0700 (PDT) X-Received: by 10.66.142.228 with SMTP id rz4mr8206146pab.86.1427205939809; Tue, 24 Mar 2015 07:05:39 -0700 (PDT) Received: from localhost ([180.150.148.224]) by mx.google.com with ESMTPSA id j5sm4303312pdo.60.2015.03.24.07.05.38 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 24 Mar 2015 07:05:39 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely Cc: 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, Hanjun Guo , 'Stefano Stabellini' , Julien Grall , Konrad Rzeszutek Wilk , Boris Ostrovsky , David Vrabel Subject: [patch v11 19/23] XEN / ACPI: Make XEN ACPI depend on X86 Date: Tue, 24 Mar 2015 22:02:52 +0800 Message-Id: <1427205776-5060-20-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427205776-5060-1-git-send-email-hanjun.guo@linaro.org> References: <1427205776-5060-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 + 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)