[PATCH 5/9] ARM: Xen: fix initial build problems:
From: Stefano Stabellini <hidden>
Date: 2012-10-09 15:38:10
Also in:
lkml, xen-devel
Thanks for the patch and sorry for the build breakage! On Tue, 9 Oct 2012, Arnd Bergmann wrote:
quoted hunk ↗ jump to hunk
* 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 <arnd@arndb.de> Cc: Stefano Stabellini <redacted> Cc: Konrad Rzeszutek Wilk <redacted> Cc: Jeremy Fitzhardinge <redacted> Cc: xen-devel at 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.
Considering that we rely on the virtualization extensions, this one can
be:
depends on CPU_V7
The rest looks fine. I can submit a second patch to change !CPU_V6 into
CPU_V7 later, if you prefer.
quoted hunk ↗ jump to hunk
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 hooksdiff --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 <linux/kernel.h> #include <linux/module.h> #include <linux/kobject.h> +#include <linux/err.h> #include <asm/xen/hypervisor.h> #include <asm/xen/hypercall.h>-- 1.7.10