moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'memblock-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Browse Source 
Pull memblock updates from Mike Rapoport:
 "Robustness and debug improvements:

   - add check for memory add/cap ordering

   - add missing debug code to memblock_add_node()"

* tag 'memblock-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: Check memory add/cap ordering
  memblock: Add missing debug code to memblock_add_node()
This commit is contained in:
Linus Torvalds
2021-09-02 12:26:31 -07:00
parent 4a3bb4200a e888fa7bb8
commit 612b23f277
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mm/memblock.c
View File

@@ -665,6 +665,11 @@ repeat:
int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size, int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size,
int nid) int nid)
{ {
phys_addr_t end = base + size - 1;
memblock_dbg("%s: [%pa-%pa] nid=%d %pS\n", __func__,
&base, &end, nid, (void *)_RET_IP_);
return memblock_add_range(&memblock.memory, base, size, nid, 0); return memblock_add_range(&memblock.memory, base, size, nid, 0);
} }
@@ -1680,6 +1685,11 @@ void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size)
if (!size) if (!size)
return; return;
if (memblock.memory.cnt <= 1) {
pr_warn("%s: No memory registered yet\n", __func__);
return;
}
ret = memblock_isolate_range(&memblock.memory, base, size, ret = memblock_isolate_range(&memblock.memory, base, size,
&start_rgn, &end_rgn); &start_rgn, &end_rgn);
if (ret) if (ret)