evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mm/memblock.c: use PFN_PHYS()

Browse source 
Replace ((phys_addr_t)(x) << PAGE_SHIFT) by 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>
This commit is contained in:
Fabian Frederick 2014-04-07 15:37:53 -07:00 • committed by Linus Torvalds
commit 1676323030
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mm/memblock.c
View file

@ -1253,7 +1253,7 @@ phys_addr_t __init memblock_mem_size(unsigned long limit_pfn)
pages += end_pfn - start_pfn; pages += end_pfn - start_pfn;
} }
return (phys_addr_t)pages << PAGE_SHIFT; return PFN_PHYS(pages);
} }
/* lowest address */ /* lowest address */
@ -1324,7 +1324,7 @@ int __init_memblock memblock_search_pfn_nid(unsigned long pfn,
unsigned long *start_pfn, unsigned long *end_pfn) unsigned long *start_pfn, unsigned long *end_pfn)
{ {
struct memblock_type *type = &memblock.memory; 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) if (mid == -1)
return -1; return -1;