From 248f5b22399a446f0fb344a50635c89110fc92e6 Mon Sep 17 00:00:00 2001 From: Johnny Mnemonic Date: Mon, 2 Dec 2024 22:53:33 +0100 Subject: [PATCH] Also include additional patch for linux-6.12.y This issue was only recently detected but was not triggering a problem for the used kernel configuration as the current one does not use `CONFIG_IA64_UNCACHED_ALLOCATOR=y`. --- ...8-ia64-fix-incomplete-partial-revert.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 patches/linux-6.12.y/0038-ia64-fix-incomplete-partial-revert.patch diff --git a/patches/linux-6.12.y/0038-ia64-fix-incomplete-partial-revert.patch b/patches/linux-6.12.y/0038-ia64-fix-incomplete-partial-revert.patch new file mode 100644 index 0000000000000..4e864f4a12790 --- /dev/null +++ b/patches/linux-6.12.y/0038-ia64-fix-incomplete-partial-revert.patch @@ -0,0 +1,30 @@ +From 20a96fcd06292486de96c8d53cb441909c036f84 Mon Sep 17 00:00:00 2001 +From: Johnny Mnemonic +Date: Mon, 2 Dec 2024 22:46:09 +0100 +Subject: [PATCH 38/38] ia64: fix incomplete partial revert + +The partial revert in dae19098164a8deb9c67c186a24ef35819af48d3 was +incomplete, making a build time check in mm/debug.c: +``` +BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) != __NR_PAGEFLAGS + 1); +``` +...failing when `CONFIG_IA64_UNCACHED_ALLOCATOR=y` was used. +--- + include/trace/events/mmflags.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h +index 84abc858ca3d..a5282c71932b 100644 +--- a/include/trace/events/mmflags.h ++++ b/include/trace/events/mmflags.h +@@ -124,6 +124,7 @@ + DEF_PAGEFLAG_NAME(swapbacked), \ + DEF_PAGEFLAG_NAME(unevictable) \ + IF_HAVE_PG_MLOCK(mlocked) \ ++IF_HAVE_PG_UNCACHED(uncached) \ + IF_HAVE_PG_HWPOISON(hwpoison) \ + IF_HAVE_PG_IDLE(idle) \ + IF_HAVE_PG_IDLE(young) \ +-- +2.25.1 +