mm/memblock.c: use PFN_DOWN

Replace ((x) >> PAGE_SHIFT) with the pfn macro.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/memblock.c b/mm/memblock.c
index 14673641131824ecdad77ba0f5547940ca42139d..0aa0d2b0762443d90a9f432a7969bef24b02c09b 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1402,9 +1402,8 @@ int __init_memblock memblock_search_pfn_nid(unsigned long pfn,
        if (mid == -1)
                return -1;
 
-       *start_pfn = type->regions[mid].base >> PAGE_SHIFT;
-       *end_pfn = (type->regions[mid].base + type->regions[mid].size)
-                       >> PAGE_SHIFT;
+       *start_pfn = PFN_DOWN(type->regions[mid].base);
+       *end_pfn = PFN_DOWN(type->regions[mid].base + type->regions[mid].size);
 
        return type->regions[mid].nid;
 }