From patchwork Tue Oct 9 15:22:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12072 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9A75C23F6D for ; Tue, 9 Oct 2012 15:23:41 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4D3B1A18CD7 for ; Tue, 9 Oct 2012 15:23:41 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so895782iag.11 for ; Tue, 09 Oct 2012 08:23:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=Dw3ldtb6hP+gzqJDuvNl7z1fHH9lxP2ufVtOsE48SfA=; b=heJrS/xvyUNKuztBVcFQ5ja7gQwS5O10CpEFkvilldg/3rYmugxf6v2gP9bnrHmqOH G0v2tiAhinlsTNZIHbGllvbfOGyMj+qEJShsqTdJHzN5TzcAUKwiDZKeKzS3CYsoFIBA UP6KpV3SfMtiUt9LlpfEXK+BH7K14IhSF9JGLrhZVb7YtKhNi51nlA9DlOPhKXC7hIfq AAukMZ1pZ0ssqjgBGrzqo+xkJRGcETWhvK/78wMzq6/Ep6vl4lsg6Hm/nX8LhhjzpFhl 4Z1jAiRpNapEnXr+hLDX5NC8eQR+COG3WduhH2KiWBZCqIksF6XEAyp2nzxEnr5ze1GR TY/A== Received: by 10.50.46.226 with SMTP id y2mr1992624igm.62.1349796221025; Tue, 09 Oct 2012 08:23:41 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp73098igt; Tue, 9 Oct 2012 08:23:40 -0700 (PDT) Received: by 10.216.56.82 with SMTP id l60mr11502087wec.18.1349796219614; Tue, 09 Oct 2012 08:23:39 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.8]) by mx.google.com with ESMTPS id v57si14678035wee.22.2012.10.09.08.23.39 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 08:23:39 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.8; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0LsR2m-1TWiXd187U-012XkF; Tue, 09 Oct 2012 17:23:25 +0200 From: Arnd Bergmann To: Russell King Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Stefano Stabellini , Konrad Rzeszutek Wilk , Jeremy Fitzhardinge , xen-devel@lists.xensource.com Subject: [PATCH 5/9] ARM: Xen: fix initial build problems: Date: Tue, 9 Oct 2012 17:22:59 +0200 Message-Id: <1349796183-30648-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349796183-30648-1-git-send-email-arnd@arndb.de> References: <1349796183-30648-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:wonDB4PQGnkIHpBIToFyQGOp1BxaQQhDbrVUFMu/jE5 pNfF+A9qryJ8vA8tLb8bX050UC/Nh+SdwRV6rix6YT7TcQfjp0 vytJUOciR4R3OiSpqvVHvxhrI1QM2wN7Hojj/IQOeHywzX45Tf 43io2aZlRHPDxc+A0v92bGE+ID5aeMEr53kIhG+k3nxbnfqggN NOGuM03fOP7vq8mrmswr2QhoujxlnX/Hd7UkyPfda4Soo3lj8W xfpCu8rc69bNblqBoU95vGZuQeG5zlvgChMfaDbcL3ovOn/UxJ 8g1uHTdOpWKPjrtFpbJvhxGgLrgceK6EkJ+TvazCc2jPj5LBPq 9R+/wh2L7o1t2rPc4YVbHAyYUkfU5hlB11488mtebOsdG8iU6v hs7faw/ByjL17NguB8J83HtolqglKXg72s= X-Gm-Message-State: ALoCoQkZVQJjsrdslBQoqczi6PcVkNqrFjQD8U6TBAtArJqRQjyzXIAVDZvlc7gX26AeDfr86sfK * The XEN_BALLOON code requires the balloon infrastructure that is not getting built on ARM. * The tmem hypercall is not available on ARM * ARMv6 does not support cmpxchg on 16-bit words that are used in the * sys-hypervisor.c needs to include linux/err.h in order to use the IS_ERR/PTR_ERR/ERR_PTR family of functions. Signed-off-by: Arnd Bergmann Cc: Stefano Stabellini Cc: Konrad Rzeszutek Wilk Cc: Jeremy Fitzhardinge Cc: xen-devel@lists.xensource.com --- arch/arm/Kconfig | 1 + drivers/xen/Kconfig | 2 ++ drivers/xen/sys-hypervisor.c | 1 + 3 files changed, 4 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6d2f7f5..85eaac3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1846,6 +1846,7 @@ config XEN_DOM0 config XEN bool "Xen guest support on ARM (EXPERIMENTAL)" depends on EXPERIMENTAL && ARM && OF + depends on !CPU_V6 help Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index d4dffcd..126d8ce 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -3,6 +3,7 @@ menu "Xen driver support" config XEN_BALLOON bool "Xen memory balloon driver" + depends on !ARM default y help The balloon driver allows the Xen domain to request more memory from @@ -145,6 +146,7 @@ config SWIOTLB_XEN config XEN_TMEM bool + depends on !ARM default y if (CLEANCACHE || FRONTSWAP) help Shim to interface in-kernel Transcendent Memory hooks diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c index 5e5ad7e..66a0a14 100644 --- a/drivers/xen/sys-hypervisor.c +++ b/drivers/xen/sys-hypervisor.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include