diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-04-07 18:37:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 19:35:58 -0400 |
commit | 167632303005670713603452a3c9ee5de4aa5828 (patch) | |
tree | 0e4c3ffc398200c0c8ed02d0fdb4561408d7a2b0 /mm | |
parent | 136199f0a67cd6bb3f0e8de0ad50f52879f82077 (diff) |
mm/memblock.c: use PFN_PHYS()
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>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index c5c20c46f97e..e9d6ca9a01a9 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
@@ -1253,7 +1253,7 @@ phys_addr_t __init memblock_mem_size(unsigned long limit_pfn) | |||
1253 | pages += end_pfn - start_pfn; | 1253 | pages += end_pfn - start_pfn; |
1254 | } | 1254 | } |
1255 | 1255 | ||
1256 | return (phys_addr_t)pages << PAGE_SHIFT; | 1256 | return PFN_PHYS(pages); |
1257 | } | 1257 | } |
1258 | 1258 | ||
1259 | /* lowest address */ | 1259 | /* lowest address */ |
@@ -1324,7 +1324,7 @@ int __init_memblock memblock_search_pfn_nid(unsigned long pfn, | |||
1324 | unsigned long *start_pfn, unsigned long *end_pfn) | 1324 | unsigned long *start_pfn, unsigned long *end_pfn) |
1325 | { | 1325 | { |
1326 | struct memblock_type *type = &memblock.memory; | 1326 | struct memblock_type *type = &memblock.memory; |
1327 | int mid = memblock_search(type, (phys_addr_t)pfn << PAGE_SHIFT); | 1327 | int mid = memblock_search(type, PFN_PHYS(pfn)); |
1328 | 1328 | ||
1329 | if (mid == -1) | 1329 | if (mid == -1) |
1330 | return -1; | 1330 | return -1; |