tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 9d108907 519b3b74

+5 -5
+4 -4
arch/x86/Kconfig
··· 746 746 def_bool y if X86_64 747 747 ---help--- 748 748 Support for software bounce buffers used on x86-64 systems 749 - which don't have a hardware IOMMU (e.g. the current generation 750 - of Intel's x86-64 CPUs). Using this PCI devices which can only 751 - access 32-bits of memory can be used on systems with more than 752 - 3 GB of memory. If unsure, say Y. 749 + which don't have a hardware IOMMU. Using this PCI devices 750 + which can only access 32-bits of memory can be used on systems 751 + with more than 3 GB of memory. 752 + If unsure, say Y. 753 753 754 754 config IOMMU_HELPER 755 755 def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
+1 -1
arch/x86/mm/init.c
··· 319 319 */ 320 320 int devmem_is_allowed(unsigned long pagenr) 321 321 { 322 - if (pagenr <= 256) 322 + if (pagenr < 256) 323 323 return 1; 324 324 if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) 325 325 return 0;