diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-25 15:52:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-25 15:52:46 +0100 |
| commit | 47cd95a6326888a46e7ce8389cd394a3e1c647e7 (patch) | |
| tree | dfbb526bcca1a4f627294f19983e1f0b43af9204 /include/linux/mm_inline.h | |
| parent | 9f6f941e25bad8fcffc24d10762962d62edba767 (diff) | |
| parent | 883af14e67e8b8702b5560aa64c888c0cd0bd66c (diff) | |
| download | linux-next-47cd95a6326888a46e7ce8389cd394a3e1c647e7.tar.gz linux-next-47cd95a6326888a46e7ce8389cd394a3e1c647e7.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/mm_inline.h')
| -rw-r--r-- | include/linux/mm_inline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 71613e8a720f..41d376e7116d 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -39,7 +39,7 @@ static __always_inline void update_lru_size(struct lruvec *lruvec, { __update_lru_size(lruvec, lru, zid, nr_pages); #ifdef CONFIG_MEMCG - mem_cgroup_update_lru_size(lruvec, lru, nr_pages); + mem_cgroup_update_lru_size(lruvec, lru, zid, nr_pages); #endif } |