aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2010-10-08 11:06:20 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2010-10-18 10:49:40 -0400
commit2775609c5d9a9d40ad5f101e23438ceacee4250b (patch)
tree1c398365b8eb4dcab7dffa900c7516d90956a6b3
parentc5f8e29d4cf3b29fe58df90f51676d812dfd16bd (diff)
downloadmrst-s0i3-test-2775609c5d9a9d40ad5f101e23438ceacee4250b.tar.gz
mrst-s0i3-test-2775609c5d9a9d40ad5f101e23438ceacee4250b.tar.xz
mrst-s0i3-test-2775609c5d9a9d40ad5f101e23438ceacee4250b.zip
swiotlb-xen: On x86-32 builts, select SWIOTLB instead of depending on it.
We used to depend on CONFIG_SWIOTLB, but that is disabled by default. So when compiling we get this compile error: arch/x86/xen/pci-swiotlb-xen.c: In function 'pci_xen_swiotlb_detect': arch/x86/xen/pci-swiotlb-xen.c:48: error: lvalue required as left operand of assignment Fix it by actually activating the SWIOTLB library. Reported-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--drivers/xen/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index f70a627080e..6e6180ccd72 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -74,6 +74,7 @@ config XEN_PLATFORM_PCI
config SWIOTLB_XEN
def_bool y
- depends on PCI && SWIOTLB
+ depends on PCI
+ select SWIOTLB
endmenu