Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion mm/list_lru.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,12 @@ int __list_lru_init(struct list_lru *lru, bool memcg_aware, struct shrinker *shr
int i;

#ifdef CONFIG_MEMCG
if (shrinker)
/*
* If the shrinker fell back to being non-memcg-aware (e.g. with
* cgroup.memory=nokmem), its id was never assigned and holds a
* stale 0. Don't let set_shrinker_bit() act on it.
*/
if (shrinker && (shrinker->flags & SHRINKER_MEMCG_AWARE))
lru->shrinker_id = shrinker->id;
else
lru->shrinker_id = -1;
Expand Down
Loading