@@ -36,7 +36,6 @@
#include <linux/memblock.h>
#include <linux/compaction.h>
#include <linux/rmap.h>
-#include <linux/khugepaged.h>
#include <asm/tlbflush.h>
@@ -858,7 +857,6 @@ int __ref online_pages(unsigned long pfn
zone_pcp_update(zone);
init_per_zone_wmark_min();
- khugepaged_min_free_kbytes_update();
kswapd_run(nid);
kcompactd_run(nid);
@@ -1617,7 +1615,6 @@ static int __ref __offline_pages(unsigne
pgdat_resize_unlock(zone->zone_pgdat, &flags);
init_per_zone_wmark_min();
- khugepaged_min_free_kbytes_update();
if (!populated_zone(zone)) {
zone_pcp_reset(zone);
@@ -69,6 +69,7 @@
#include <linux/nmi.h>
#include <linux/psi.h>
#include <linux/padata.h>
+#include <linux/khugepaged.h>
#include <asm/sections.h>
#include <asm/tlbflush.h>
@@ -7904,6 +7905,8 @@ int __meminit init_per_zone_wmark_min(vo
setup_min_slab_ratio();
#endif
+ khugepaged_min_free_kbytes_update();
+
return 0;
}
postcore_initcall(init_per_zone_wmark_min)
The patch titled Subject: mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5 has been removed from the -mm tree. Its filename was mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5.patch This patch was dropped because it was folded into mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch ------------------------------------------------------ From: Vijay Balakrishna <vijayb@linux.microsoft.com> Subject: mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged-v5 made changes to move khugepaged_min_free_kbytes_update into init_per_zone_wmark_min and rested changes Link: https://lkml.kernel.org/r/1601398153-5517-1-git-send-email-vijayb@linux.microsoft.com Fixes: f000565adb77 ("thp: set recommended min free kbytes") Signed-off-by: Vijay Balakrishna <vijayb@linux.microsoft.com> Reviewed-by: Pavel Tatashin <pasha.tatashin@soleen.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Allen Pais <apais@microsoft.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Song Liu <songliubraving@fb.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- mm/memory_hotplug.c | 3 --- mm/page_alloc.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)