diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-17 10:44:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-17 10:44:22 -0800 |
| commit | cc669743a39e3f61c9ca5e786e959bf478ccd197 (patch) | |
| tree | 99b1e239b6dea761435a5199c994371f01f500bf /drivers/vfio/Kconfig | |
| parent | Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux (diff) | |
| parent | drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU (diff) | |
| download | linux-dev-cc669743a39e3f61c9ca5e786e959bf478ccd197.tar.xz linux-dev-cc669743a39e3f61c9ca5e786e959bf478ccd197.zip | |
Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- s390 support (Frank Blaschka)
- Enable iommu-type1 for ARM SMMU (Will Deacon)
* tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio:
drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU
vfio: make vfio run on s390
Diffstat (limited to 'drivers/vfio/Kconfig')
| -rw-r--r-- | drivers/vfio/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig index d8c57636b9ce..14e27ab32456 100644 --- a/drivers/vfio/Kconfig +++ b/drivers/vfio/Kconfig @@ -16,7 +16,7 @@ config VFIO_SPAPR_EEH menuconfig VFIO tristate "VFIO Non-Privileged userspace driver framework" depends on IOMMU_API - select VFIO_IOMMU_TYPE1 if X86 + select VFIO_IOMMU_TYPE1 if (X86 || S390 || ARM_SMMU) select VFIO_IOMMU_SPAPR_TCE if (PPC_POWERNV || PPC_PSERIES) select VFIO_SPAPR_EEH if (PPC_POWERNV || PPC_PSERIES) select ANON_INODES |