aboutsummaryrefslogtreecommitdiffstats
path: root/mm/vmscan.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r--mm/vmscan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 93fdd0375b64..8fcc86f1d7bc 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -455,6 +455,9 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,
455 : SHRINK_BATCH; 455 : SHRINK_BATCH;
456 long scanned = 0, next_deferred; 456 long scanned = 0, next_deferred;
457 457
458 if (!(shrinker->flags & SHRINKER_NUMA_AWARE))
459 nid = 0;
460
458 freeable = shrinker->count_objects(shrinker, shrinkctl); 461 freeable = shrinker->count_objects(shrinker, shrinkctl);
459 if (freeable == 0 || freeable == SHRINK_EMPTY) 462 if (freeable == 0 || freeable == SHRINK_EMPTY)
460 return freeable; 463 return freeable;
@@ -680,9 +683,6 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid,
680 .memcg = memcg, 683 .memcg = memcg,
681 }; 684 };
682 685
683 if (!(shrinker->flags & SHRINKER_NUMA_AWARE))
684 sc.nid = 0;
685
686 ret = do_shrink_slab(&sc, shrinker, priority); 686 ret = do_shrink_slab(&sc, shrinker, priority);
687 if (ret == SHRINK_EMPTY) 687 if (ret == SHRINK_EMPTY)
688 ret = 0; 688 ret = 0;