evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Linus Torvalds 2012-09-21 14:26:23 -07:00
commit 9d10890792
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/Kconfig
View file

@ -746,10 +746,10 @@ config SWIOTLB
def_bool y if X86_64 def_bool y if X86_64
---help--- ---help---
Support for software bounce buffers used on x86-64 systems Support for software bounce buffers used on x86-64 systems
which don't have a hardware IOMMU (e.g. the current generation which don't have a hardware IOMMU. Using this PCI devices
of Intel's x86-64 CPUs). Using this PCI devices which can only which can only access 32-bits of memory can be used on systems
access 32-bits of memory can be used on systems with more than with more than 3 GB of memory.
3 GB of memory. If unsure, say Y. If unsure, say Y.
config IOMMU_HELPER config IOMMU_HELPER
def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)

2
arch/x86/mm/init.c
View file

@ -319,7 +319,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
*/ */
int devmem_is_allowed(unsigned long pagenr) int devmem_is_allowed(unsigned long pagenr)
{ {
if (pagenr <= 256) if (pagenr < 256)
return 1; return 1;
if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
return 0; return 0;