projects/linux·commit e2936d22

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

e2936d22 · Linus Torvalds <[email protected]> · 2026-09-24 06:16:19 -07:00

Pull memblock fix from Mike Rapoport:
 "The rework of HugeTLB bootmem allocation forgot to add the name for a
  new RSV_HUGETLB flag for proper display in debugfs.

  Add the flag name now"

* tag 'fixes-2026-09-24' of git://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock:
  mm: memblock: add missing HugeTLB flag name
Commit
e2936d228b96346d474f368f1bb0172582035577
Parents
ef33dd4e · ba13f1f3

Merge commit. Changes below are compared with the first parent: ef33dd4e.

Changes

1 files changed · +1 −0

FileStatusAddDelContent
mm/memblock.cmodified+1−0View file

mm/memblock.c

View file
diff --git a/mm/memblock.c b/mm/memblock.c
index 021db49..e6fdf95 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -2886,6 +2886,7 @@ static const char * const flagname[] = {
[ilog2(MEMBLOCK_RSRV_NOINIT)] = "RSV_NIT",
[ilog2(MEMBLOCK_RSRV_KERN)] = "RSV_KERN",
[ilog2(MEMBLOCK_KHO_SCRATCH)] = "KHO_SCRATCH",
+ [ilog2(MEMBLOCK_RSRV_HUGETLB)] = "RSV_HUGETLB",
};
static int memblock_debug_show(struct seq_file *m, void *private)