diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-22 23:56:09 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-22 23:56:09 +0200 |
| commit | b43b1ffa82aa0d4d13b5ebedcc743dfaa4c2a19f (patch) | |
| tree | 8832cbb308daf982830ddcbfd87644ae985d4151 /drivers/xen | |
| parent | ARM: drop experimental status for hotplug and Thumb2 (diff) | |
| parent | ARM: warnings in arch/arm/include/asm/uaccess.h (diff) | |
| download | linux-b43b1ffa82aa0d4d13b5ebedcc743dfaa4c2a19f.tar.xz linux-b43b1ffa82aa0d4d13b5ebedcc743dfaa4c2a19f.zip | |
Merge tag 'fixes-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/xen/sys-hypervisor.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index d4dffcd52873..126d8ce591ce 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 5e5ad7e28858..66a0a1475acf 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> |