Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d8a12d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents daf3761c 9d99c712

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1308,6 +1308,7 @@ config HIGHMEM 
config X86_PAE

	bool "PAE (Physical Address Extension) Support"

	depends on X86_32 && !HIGHMEM4G

	select SWIOTLB

	---help---

	  PAE is required for NX support, and furthermore enables

	  larger swapspace support for non-overcommit purposes. It