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

Commit 9d108907 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:
 "Small fixlets"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm/init.c: Fix devmem_is_allowed() off by one
  x86/kconfig: Remove outdated reference to Intel CPUs in CONFIG_SWIOTLB
parents 519b3b74 73e8f3d7

arch/x86/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -746,10 +746,10 @@ config SWIOTLB 
	def_bool y if X86_64

	---help---

	  Support for software bounce buffers used on x86-64 systems

	  which don't have a hardware IOMMU (e.g. the current generation

	  of Intel's x86-64 CPUs). Using this PCI devices which can only

	  access 32-bits of memory can be used on systems with more than

	  3 GB of memory. If unsure, say Y.

	  which don't have a hardware IOMMU. Using this PCI devices

	  which can only access 32-bits of memory can be used on systems

	  with more than 3 GB of memory.

	  If unsure, say Y.



config IOMMU_HELPER

	def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)

arch/x86/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, 
 */

int devmem_is_allowed(unsigned long pagenr)

{

	if (pagenr <= 256)

	if (pagenr < 256)

		return 1;

	if (iomem_is_exclusive(pagenr << PAGE_SHIFT))

		return 0;