Skip to content

Commit a7d9f30

Browse files
rppttorvalds
authored andcommitted
arm64: drop pfn_valid_within() and simplify pfn_valid()
The arm64's version of pfn_valid() differs from the generic because of two reasons: * Parts of the memory map are freed during boot. This makes it necessary to verify that there is actual physical memory that corresponds to a pfn which is done by querying memblock. * There are NOMAP memory regions. These regions are not mapped in the linear map and until the previous commit the struct pages representing these areas had default values. As the consequence of absence of the special treatment of NOMAP regions in the memory map it was necessary to use memblock_is_map_memory() in pfn_valid() and to have pfn_valid_within() aliased to pfn_valid() so that generic mm functionality would not treat a NOMAP page as a normal page. Since the NOMAP regions are now marked as PageReserved(), pfn walkers and the rest of core mm will treat them as unusable memory and thus pfn_valid_within() is no longer required at all and can be disabled on arm64. pfn_valid() can be slightly simplified by replacing memblock_is_map_memory() with memblock_is_memory(). [[email protected]: fix merge fix] Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Mike Rapoport <[email protected]> Acked-by: David Hildenbrand <[email protected]> Acked-by: Ard Biesheuvel <[email protected]> Reviewed-by: Kefeng Wang <[email protected]> Cc: Anshuman Khandual <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Will Deacon <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 873ba46 commit a7d9f30

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

arch/arm64/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ config ARM64
201201
select HAVE_KPROBES
202202
select HAVE_KRETPROBES
203203
select HAVE_GENERIC_VDSO
204-
select HOLES_IN_ZONE
205204
select IOMMU_DMA if IOMMU_SUPPORT
206205
select IRQ_DOMAIN
207206
select IRQ_FORCED_THREADING

arch/arm64/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ int pfn_valid(unsigned long pfn)
252252
if (!early_section(ms))
253253
return pfn_section_valid(ms, pfn);
254254

255-
return memblock_is_map_memory(addr);
255+
return memblock_is_memory(addr);
256256
}
257257
EXPORT_SYMBOL(pfn_valid);
258258

0 commit comments

Comments
 (0)