path: root/arch
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-10 10:31:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-10 10:31:13 -0700
commit1d8a12d1de9d9d025d66c1b2a580a293cc5050e5 (patch)
tree962391f7718c5e49ac003ef53633a2e3625515b6 /arch
parentdaf3761c9fcde0f4ca64321cbed6c1c86d304193 (diff)
parent9d99c7123c9af5f47a2037933a3ffaec3e37efad (diff)
Merge branch 'stable/for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb fixlet from Konrad Rzeszutek Wilk: "Enable the SWIOTLB under 32-bit PAE kernels. Nowadays most distros enable this due to CONFIG_HYPERVISOR|XEN=y which select SWIOTLB. But for those that are not interested in virtualization and wanting to use 32-bit PAE kernels and wanting to have working DMA operations - this configures it for them" * 'stable/for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb: swiotlb: Enable it under x86 PAE
Diffstat (limited to 'arch')
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 328c8352480c..96d058a87100 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1308,6 +1308,7 @@ config HIGHMEM
config X86_PAE
bool "PAE (Physical Address Extension) Support"
depends on X86_32 && !HIGHMEM4G
+ select SWIOTLB
PAE is required for NX support, and furthermore enables
larger swapspace support for non-overcommit purposes. It