Skip to content

Commit 248f5b2

Browse files
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`.
1 parent 1a2751e commit 248f5b2

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 20a96fcd06292486de96c8d53cb441909c036f84 Mon Sep 17 00:00:00 2001
2+
From: Johnny Mnemonic <jm@machine-hall.org>
3+
Date: Mon, 2 Dec 2024 22:46:09 +0100
4+
Subject: [PATCH 38/38] ia64: fix incomplete partial revert
5+
6+
The partial revert in dae19098164a8deb9c67c186a24ef35819af48d3 was
7+
incomplete, making a build time check in mm/debug.c:
8+
```
9+
BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) != __NR_PAGEFLAGS + 1);
10+
```
11+
...failing when `CONFIG_IA64_UNCACHED_ALLOCATOR=y` was used.
12+
---
13+
include/trace/events/mmflags.h | 1 +
14+
1 file changed, 1 insertion(+)
15+
16+
diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h
17+
index 84abc858ca3d..a5282c71932b 100644
18+
--- a/include/trace/events/mmflags.h
19+
+++ b/include/trace/events/mmflags.h
20+
@@ -124,6 +124,7 @@
21+
DEF_PAGEFLAG_NAME(swapbacked), \
22+
DEF_PAGEFLAG_NAME(unevictable) \
23+
IF_HAVE_PG_MLOCK(mlocked) \
24+
+IF_HAVE_PG_UNCACHED(uncached) \
25+
IF_HAVE_PG_HWPOISON(hwpoison) \
26+
IF_HAVE_PG_IDLE(idle) \
27+
IF_HAVE_PG_IDLE(young) \
28+
--
29+
2.25.1
30+

0 commit comments

Comments
 (0)