diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memblock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index d6897fbe021f..20358374e8a8 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
| @@ -1269,7 +1269,7 @@ phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size, | |||
| 1269 | return memblock_alloc_range_nid(size, align, 0, max_addr, nid, flags); | 1269 | return memblock_alloc_range_nid(size, align, 0, max_addr, nid, flags); |
| 1270 | } | 1270 | } |
| 1271 | 1271 | ||
| 1272 | phys_addr_t __init memblock_alloc_nid(phys_addr_t size, phys_addr_t align, int nid) | 1272 | phys_addr_t __init memblock_phys_alloc_nid(phys_addr_t size, phys_addr_t align, int nid) |
| 1273 | { | 1273 | { |
| 1274 | enum memblock_flags flags = choose_memblock_flags(); | 1274 | enum memblock_flags flags = choose_memblock_flags(); |
| 1275 | phys_addr_t ret; | 1275 | phys_addr_t ret; |
| @@ -1304,14 +1304,14 @@ phys_addr_t __init memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys | |||
| 1304 | return alloc; | 1304 | return alloc; |
| 1305 | } | 1305 | } |
| 1306 | 1306 | ||
| 1307 | phys_addr_t __init memblock_alloc(phys_addr_t size, phys_addr_t align) | 1307 | phys_addr_t __init memblock_phys_alloc(phys_addr_t size, phys_addr_t align) |
| 1308 | { | 1308 | { |
| 1309 | return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE); | 1309 | return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE); |
| 1310 | } | 1310 | } |
| 1311 | 1311 | ||
| 1312 | phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid) | 1312 | phys_addr_t __init memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid) |
| 1313 | { | 1313 | { |
| 1314 | phys_addr_t res = memblock_alloc_nid(size, align, nid); | 1314 | phys_addr_t res = memblock_phys_alloc_nid(size, align, nid); |
| 1315 | 1315 | ||
| 1316 | if (res) | 1316 | if (res) |
| 1317 | return res; | 1317 | return res; |
