mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
memblock: Make memblock_alloc_try_nid() fallback to MEMBLOCK_ALLOC_ANYWHERE
memblock_alloc_nid() used to fallback to allocating anywhere by using memblock_alloc() as a fallback. However, some of my previous patches limit memblock_alloc() to the region covered by MEMBLOCK_ALLOC_ACCESSIBLE which is not quite what we want for memblock_alloc_try_nid(). So we fix it by explicitely using MEMBLOCK_ALLOC_ANYWHERE. Not that so far only sparc uses memblock_alloc_nid() and it hasn't been updated to clamp the accessible zone yet. Thus the temporary "breakage" should have no effect. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
9d1e24928e
commit
918fe8d603
1 changed files with 1 additions and 1 deletions
|
@ -546,7 +546,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
|
|||
|
||||
if (res)
|
||||
return res;
|
||||
return memblock_alloc(size, align);
|
||||
return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ANYWHERE);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue