github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

memblock: fix for regions display in debugfs and MAINTAINERS update

Browse Source 
* Make sure that multiple flags on a memblock region are all displayed in
 debugfs
 
 * Update memblock tree tags in MAINTAINERS
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEeOVYVaWZL5900a/pOQOGJssO/ZEFAmqngKwACgkQOQOGJssO
 /ZEC6wf/UmxuXyH6jMZY0fLlHe0i0sH6v9h2qna7MxNuGaYVaBBgsMQitfD89JJD
 Z7JqGS3SBFQ5SOfBL49zDNQP/5mN5cMiubyhoQI2TvmqLkQn5OggXHXs+xPkbIEd
 aJqAmhlGtVNcG2iwEgbfNyqCApefsNj4wKKIhF67mYWCBdnBNb8cDeLDQm5EWFkc
 s3TACvuT1osIjpObj0mwbN7HUJhpODYbQt3fwRTqX2hXJA0pakxhY7iCMfbUpnND
 sfdjFtfmFKm3057l4yBFQtyL/vMd0rUlZ35iTFnDJUixL4tNNtIMKOVukUw6HXZv
 uWjW6torX1z25cAFkSTNhxQA1QZDAA==
 =I6ix
 -----END PGP SIGNATURE-----

Merge tag 'fixes-2026-09-14' of git://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock

Pull memblock fixes from Mike Rapoport:
 "Fix for regions display in debugfs and MAINTAINERS update:

   - Make sure that multiple flags on a memblock region are all
     displayed in debugfs

   - Update memblock tree tags in MAINTAINERS"

* tag 'fixes-2026-09-14' of git://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock:
  MAINTAINERS: update memblock tree URLs
  mm: memblock: show all region flags in debugfs
This commit is contained in:
Linus Torvalds 2026-09-14 09:36:43 -07:00
commit ebb58ec7f8
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -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

18
mm/memblock.c
View File

@ -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");
}