diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-14 10:29:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-14 10:29:40 +0200 |
| commit | 0ba78a95a6629975ff16545ae868fa1bb38f786a (patch) | |
| tree | bb51f571bb187bc10f3a9639789afd4cf49b5b27 /include/linux/memcontrol.h | |
| parent | def34eaae5ce04b324e48e1bfac873091d945213 (diff) | |
| parent | a232591ba289a1a397e0005c9f276a126c1bc1b1 (diff) | |
| download | lwn-0ba78a95a6629975ff16545ae868fa1bb38f786a.tar.gz lwn-0ba78a95a6629975ff16545ae868fa1bb38f786a.zip | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/memcontrol.h')
| -rw-r--r-- | include/linux/memcontrol.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 5af377303880..bb7250c45cb8 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -740,6 +740,12 @@ static inline bool mem_cgroup_oom_synchronize(bool wait) return false; } +static inline void mem_cgroup_update_page_stat(struct page *page, + enum mem_cgroup_stat_index idx, + int nr) +{ +} + static inline void mem_cgroup_inc_page_stat(struct page *page, enum mem_cgroup_stat_index idx) { |