diff options
Diffstat (limited to '0016-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch')
-rw-r--r-- | 0016-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/0016-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch b/0016-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch index 8f52ee5d8a8b..6f96726231d1 100644 --- a/0016-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch +++ b/0016-ZEN-mm-Stop-kswapd-early-when-nothing-s-waiting-for-.patch @@ -30,10 +30,10 @@ Contains: 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/mm/internal.h b/mm/internal.h -index d80300392a19..96aa50e46119 100644 +index cf16280ce132187e5652c5d9088bac716f879a27..b9ad231c84fa97fb927c3f38d899657c9a7ed2f3 100644 --- a/mm/internal.h +++ b/mm/internal.h -@@ -248,6 +248,7 @@ extern void prep_compound_page(struct page *page, unsigned int order); +@@ -256,6 +256,7 @@ extern void prep_compound_page(struct page *page, unsigned int order); extern void post_alloc_hook(struct page *page, unsigned int order, gfp_t gfp_flags); extern int user_min_free_kbytes; @@ -42,7 +42,7 @@ index d80300392a19..96aa50e46119 100644 extern void free_unref_page(struct page *page, unsigned int order); extern void free_unref_page_list(struct list_head *list); diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 5690ef37d2bf..d3ab6e198718 100644 +index fa30891058e1e1c7cc262560736c45fed66fd377..7e43b957aa2dbbdc20586848d51dd03e785a269b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -121,6 +121,8 @@ typedef int __bitwise fpi_t; @@ -54,7 +54,7 @@ index 5690ef37d2bf..d3ab6e198718 100644 /* prevent >1 _updater_ of zone percpu pageset ->high and ->batch fields */ static DEFINE_MUTEX(pcp_batch_high_lock); #define MIN_PERCPU_PAGELIST_HIGH_FRACTION (8) -@@ -4878,6 +4880,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, +@@ -4897,6 +4899,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, int no_progress_loops; unsigned int cpuset_mems_cookie; int reserve_flags; @@ -62,7 +62,7 @@ index 5690ef37d2bf..d3ab6e198718 100644 /* * We also sanity check to catch abuse of atomic reserves being used by -@@ -4924,8 +4927,13 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, +@@ -4943,8 +4946,13 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, goto nopage; } @@ -77,7 +77,7 @@ index 5690ef37d2bf..d3ab6e198718 100644 /* * The adjusted alloc_flags might result in immediate success, so try -@@ -5130,9 +5138,12 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, +@@ -5149,9 +5157,12 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, goto retry; } fail: @@ -93,10 +93,10 @@ index 5690ef37d2bf..d3ab6e198718 100644 } diff --git a/mm/vmscan.c b/mm/vmscan.c -index 59b14e0d696c..3d8cbc64af8c 100644 +index 1678802e03e78577c3366afeed00f23fdaa95aca..48652f0523ac6e334522e0989e09d3ec2e80056b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c -@@ -4275,7 +4275,8 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx) +@@ -4204,7 +4204,8 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx) __fs_reclaim_release(_THIS_IP_); ret = try_to_freeze(); __fs_reclaim_acquire(_THIS_IP_); @@ -106,6 +106,3 @@ index 59b14e0d696c..3d8cbc64af8c 100644 break; /* --- -2.35.1 - |