diff options
| -rw-r--r-- | arch/x86/Kconfig | 8 | ||||
| -rw-r--r-- | arch/x86/mm/init.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8ec3a1aa4abd..50a1d1f9b6d3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -746,10 +746,10 @@ config SWIOTLB | |||
| 746 | def_bool y if X86_64 | 746 | def_bool y if X86_64 |
| 747 | ---help--- | 747 | ---help--- |
| 748 | Support for software bounce buffers used on x86-64 systems | 748 | Support for software bounce buffers used on x86-64 systems |
| 749 | which don't have a hardware IOMMU (e.g. the current generation | 749 | which don't have a hardware IOMMU. Using this PCI devices |
| 750 | of Intel's x86-64 CPUs). Using this PCI devices which can only | 750 | which can only access 32-bits of memory can be used on systems |
| 751 | access 32-bits of memory can be used on systems with more than | 751 | with more than 3 GB of memory. |
| 752 | 3 GB of memory. If unsure, say Y. | 752 | If unsure, say Y. |
| 753 | 753 | ||
| 754 | config IOMMU_HELPER | 754 | config IOMMU_HELPER |
| 755 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) | 755 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) |
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index e0e6990723e9..ab1f6a93b527 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c | |||
| @@ -319,7 +319,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, | |||
| 319 | */ | 319 | */ |
| 320 | int devmem_is_allowed(unsigned long pagenr) | 320 | int devmem_is_allowed(unsigned long pagenr) |
| 321 | { | 321 | { |
| 322 | if (pagenr <= 256) | 322 | if (pagenr < 256) |
| 323 | return 1; | 323 | return 1; |
| 324 | if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) | 324 | if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) |
| 325 | return 0; | 325 | return 0; |
