Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16763230 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

mm/memblock.c: use PFN_PHYS() 



Replace ((phys_addr_t)(x) << PAGE_SHIFT) by pfn macro.

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 136199f0

mm/memblock.c

+2 −2
Original line number Diff line number Diff line
@@ -1253,7 +1253,7 @@ phys_addr_t __init memblock_mem_size(unsigned long limit_pfn) 
		pages += end_pfn - start_pfn;

	}



	return (phys_addr_t)pages << PAGE_SHIFT;

	return PFN_PHYS(pages);

}



/* lowest address */
@@ -1324,7 +1324,7 @@ int __init_memblock memblock_search_pfn_nid(unsigned long pfn, 
			 unsigned long *start_pfn, unsigned long *end_pfn)

{

	struct memblock_type *type = &memblock.memory;

	int mid = memblock_search(type, (phys_addr_t)pfn << PAGE_SHIFT);

	int mid = memblock_search(type, PFN_PHYS(pfn));



	if (mid == -1)

		return -1;