diff options
| author | David Hildenbrand (Arm) <david@kernel.org> | 2026-09-14 07:56:16 +0000 |
|---|---|---|
| committer | David Hildenbrand (Arm) <david@kernel.org> | 2026-09-14 07:56:16 +0000 |
| commit | 36119642bfe265051a744aa702bacfa11e406f1f (patch) | |
| tree | f3ba4859832679b0565f3f9479957d62631e17b0 | |
| parent | 704340f1cd0dcef829eb62f5b48ae95a2ce17bdf (diff) | |
| parent | 6e33dc90df108c76899dc544a42d17adcba61668 (diff) | |
| download | linux-next-36119642bfe265051a744aa702bacfa11e406f1f.tar.gz linux-next-36119642bfe265051a744aa702bacfa11e406f1f.zip | |
Merge https://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock.git fixes into for-next-fixes
Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | mm/memblock.c | 18 |
2 files changed, 13 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c2414447892c..3b2eb2a7a89a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17031,8 +17031,8 @@ MEMBLOCK AND MEMORY MANAGEMENT INITIALIZATION M: Mike Rapoport <rppt@kernel.org> L: linux-mm@kvack.org S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git for-next -T: git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git fixes +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock.git for-next +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock.git fixes F: Documentation/core-api/boot-time-mm.rst F: include/linux/kho/abi/memblock.h F: include/linux/memblock.h diff --git a/mm/memblock.c b/mm/memblock.c index 9ce86349a29f..021db49eb7fc 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2908,14 +2908,18 @@ static int memblock_debug_show(struct seq_file *m, void *private) else seq_printf(m, "%4c ", 'x'); if (reg->flags) { - for (j = 0; j < count; j++) { - if (reg->flags & (1U << j)) { - seq_printf(m, "%s\n", flagname[j]); - break; - } + unsigned int flags = reg->flags; + bool first = true; + + for (j = 0; flags; j++, flags >>= 1) { + if (!(flags & 1)) + continue; + if (!first) + seq_putc(m, '|'); + seq_puts(m, j < count ? flagname[j] : "UNKNOWN"); + first = false; } - if (j == count) - seq_printf(m, "%s\n", "UNKNOWN"); + seq_putc(m, '\n'); } else { seq_printf(m, "%s\n", "NONE"); } |