x86 fixes
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
HEAD: 73e8f3d7e2cb23614d5115703d76d8e54764b641 x86/mm/init.c: Fix devmem_is_allowed() off by one
Small fixlets.
Thanks,
Ingo
------------------>
Joe Millenbach (1):
x86/kconfig: Remove outdated reference to Intel CPUs in CONFIG_SWIOTLB
T Makphaibulchoke (1):
x86/mm/init.c: Fix devmem_is_allowed() off by one
arch/x86/Kconfig | 8 ++++---- arch/x86/mm/init.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/Kconfig +4 -4
@@ -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
@@ -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 ;