From 11f52bf195c5bd0a3e5b4d05761ca0e8fe41559f Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 9 Oct 2012 10:33:52 +0000 Subject: [PATCH] --- yaml --- r: 334839 b: refs/heads/master c: f880b67dcbdedb49453f88d2ccb1a0937b046d82 h: refs/heads/master i: 334837: 7ad087a6ae2dc957ff0d79743a9e55f7698c71af 334835: e253d666788b718526131753487b4638328f45c3 334831: 7c3fdbb82c67168e2efd0f97a1b37222d5b21b9a v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/drivers/xen/Kconfig | 2 ++ trunk/drivers/xen/sys-hypervisor.c | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 86c2a7768f63..e0917b4363d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3accb122f2c758494a6db3b9e9a8cd62aafcf83 +refs/heads/master: f880b67dcbdedb49453f88d2ccb1a0937b046d82 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 6d2f7f5c0036..e1d6ab2b3c93 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/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_V7 && !CPU_V6 help Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. diff --git a/trunk/drivers/xen/Kconfig b/trunk/drivers/xen/Kconfig index d4dffcd52873..126d8ce591ce 100644 --- a/trunk/drivers/xen/Kconfig +++ b/trunk/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/trunk/drivers/xen/sys-hypervisor.c b/trunk/drivers/xen/sys-hypervisor.c index 5e5ad7e28858..66a0a1475acf 100644 --- a/trunk/drivers/xen/sys-hypervisor.c +++ b/trunk/drivers/xen/sys-hypervisor.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include