The patch titled
Subject: mm-khugepaged-add-struct-collapse_control-fix-fix
has been added to the -mm mm-unstable branch. Its filename is
mm-khugepaged-add-struct-collapse_control-fix-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-khugepaged-add-struct-collapse_control-fix-fix.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: mm-khugepaged-add-struct-collapse_control-fix-fix
fix build
Link: https://lkml.kernel.org/r/20220721195508.15f1e07a@xxxxxxxxxxxxxxxx
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Reviewed-by: Zach O'Keefe <zokeefe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/khugepaged.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/mm/khugepaged.c~mm-khugepaged-add-struct-collapse_control-fix-fix
+++ a/mm/khugepaged.c
@@ -87,7 +87,9 @@ static struct kmem_cache *mm_slot_cache
struct collapse_control {
/* Num pages scanned per node */
-#if HPAGE_PMD_ORDER < 16
+#if defined(CONFIG_PPC64)
+ u32 node_load[MAX_NUMNODES];
+#elif HPAGE_PMD_ORDER < 16
u16 node_load[MAX_NUMNODES];
#else
u32 node_load[MAX_NUMNODES];
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
mm-khugepaged-add-struct-collapse_control-fix-fix.patch
