[PATCH 1/5] powerpc: mm: Simplify page_is_ram by using memblock_is_memory

2018-02-22 Thread Jonathan Neuschäfer
Instead of open-coding the search in page_is_ram, call memblock_is_memory.

Signed-off-by: Jonathan Neuschäfer 
---
 arch/powerpc/mm/mem.c | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index fe8c61149fb8..da4e1555d61d 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -85,13 +85,7 @@ int page_is_ram(unsigned long pfn)
 #ifndef CONFIG_PPC64   /* XXX for now */
return pfn < max_pfn;
 #else
-   unsigned long paddr = (pfn << PAGE_SHIFT);
-   struct memblock_region *reg;
-
-   for_each_memblock(memory, reg)
-   if (paddr >= reg->base && paddr < (reg->base + reg->size))
-   return 1;
-   return 0;
+   return memblock_is_memory(__pfn_to_phys(pfn));
 #endif
 }
 
-- 
2.16.1



[PATCH 1/5] powerpc: mm: Simplify page_is_ram by using memblock_is_memory

2018-02-22 Thread Jonathan Neuschäfer
Instead of open-coding the search in page_is_ram, call memblock_is_memory.

Signed-off-by: Jonathan Neuschäfer 
---
 arch/powerpc/mm/mem.c | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index fe8c61149fb8..da4e1555d61d 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -85,13 +85,7 @@ int page_is_ram(unsigned long pfn)
 #ifndef CONFIG_PPC64   /* XXX for now */
return pfn < max_pfn;
 #else
-   unsigned long paddr = (pfn << PAGE_SHIFT);
-   struct memblock_region *reg;
-
-   for_each_memblock(memory, reg)
-   if (paddr >= reg->base && paddr < (reg->base + reg->size))
-   return 1;
-   return 0;
+   return memblock_is_memory(__pfn_to_phys(pfn));
 #endif
 }
 
-- 
2.16.1