diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-02-15 09:06:39 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-02-15 09:07:01 +0100 |
| commit | de1528ee7cb7c161444dadbc971d050bebb5cbe7 (patch) | |
| tree | a1f53cd279966802de097c0f0f6625b49e6903f1 /include/linux/memcontrol.h | |
| parent | 0d3070f5e6551d8a759619e85736e49a3bf40398 (diff) | |
| parent | 15447b64789d9ade71eb374d5ae1f37d0bbce0bd (diff) | |
Merge branch 'for-next' into for-linus
Unification of 5.12-devel branches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/linux/memcontrol.h')
| -rw-r--r-- | include/linux/memcontrol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d827bd7f3bfe..eeb0b52203e9 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -665,7 +665,7 @@ static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page, { struct mem_cgroup *memcg = page_memcg(page); - VM_WARN_ON_ONCE_PAGE(!memcg, page); + VM_WARN_ON_ONCE_PAGE(!memcg && !mem_cgroup_disabled(), page); return mem_cgroup_lruvec(memcg, pgdat); } |