Merge 5.9 into android-mainline

Linux 5.9 Change-Id: Ic4308a3e2a4015058efdac52bd51794b604c8435 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2020-10-12 09:10:21 +02:00
parent 96191021a5 bbf5c97901
commit 8de87f4d1c
247 changed files with 3620 additions and 1366 deletions
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -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>
@@ -7919,6 +7920,8 @@ int __meminit init_per_zone_wmark_min(void)
 	setup_min_slab_ratio();
 #endif

+	khugepaged_min_free_kbytes_update();
+
 	return 0;
 }
 postcore_initcall(init_per_zone_wmark_min)