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: 6080031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B51349F440 for ; Tue, 24 Mar 2015 14:24:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D552B201D3 for ; Tue, 24 Mar 2015 14:24:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A60C72024D for ; Tue, 24 Mar 2015 14:24:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YaPfH-0008KY-6j; Tue, 24 Mar 2015 14:18:43 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YaPSz-0004rh-Gv for linux-arm-kernel@lists.infradead.org; Tue, 24 Mar 2015 14:06:02 +0000 Received: by pabxg6 with SMTP id xg6so214018938pab.0 for ; Tue, 24 Mar 2015 07:05:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iNg1iJ1iTFKG7/ciCW6jYEJDOuoFJTPzjUNZW1jpwSY=; b=Mo7s6mC2SeZ3IQKui2e3km9Tcy+JRivwcrI5zwLXJtMku0GiVk0NrWTn4fpA8Z5odW EFz4r64u4D/T4x46JlA0ATd+cyF+YQs2hDkNjs1iImgLsVd1+LmLjQ59MUh8bhrOEmDc 4WMt82JqnUnJI2IxJsWyG09IMT+XUVUEGK3IkkAupb60MSSBtZagxx33Vod++zy3Ls3D UEdMHKFoQmyQdVC8vutmddNOm/yXskKFuKzI8TrqXCNuT1bEzG5+A/grDThoz38UP0PP ckNAFD2ff9kQk1cPXB7iSXJdFzNb4z6GukCKuYMJy4FUee4U6//qIzJzebzagNGs+jy/ y7Tg== X-Gm-Message-State: ALoCoQlzoLzdGrQDIfYb/sgtMlNgxMSGeSxYwJbwkrjaCjXYcKyvQakh6HPJnRNWGmYokg19Ucjb 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150324_070601_645429_7EC2F430 X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: -0.7 (/) Cc: Mark Rutland , linaro-acpi@lists.linaro.org, Lorenzo Pieralisi , Timur Tabi , 'Stefano Stabellini' , linux-acpi@vger.kernel.org, Mark Salter , David Vrabel , Robert Richter , Arnd Bergmann , Konrad Rzeszutek Wilk , Marc Zyngier , Jon Masters , Julien Grall , Mark Brown , Boris Ostrovsky , linux-arm-kernel@lists.infradead.org, Graeme Gregory , Ashwin Chaugule , linux-kernel@vger.kernel.org, Hanjun Guo , Suravee Suthikulpanit , Sudeep Holla X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Stefano Stabellini --- 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)