Messages in this thread Patch in this message |  | | Date | Tue, 21 Oct 2014 17:05:54 -0400 | From | Johannes Weiner <> | Subject | Re: [patch 4/4] mm: memcontrol: simplify per-memcg page statistics accounting |
| |
On Tue, Oct 21, 2014 at 04:21:36PM -0400, Johannes Weiner wrote: > @@ -315,13 +290,13 @@ mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) > { > } > > -static inline void mem_cgroup_begin_update_page_stat(struct page *page, > +static inline void mem_cgroup_begin_page_stat(struct page *page, > bool *locked, unsigned long *flags)
I forgot to refresh after fixing the allnoconfig build. Andrew could you fold the following please if/when merging this patch? Thanks!
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> ---
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 4dc4a2aec440..ea007615e8f9 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -290,9 +290,10 @@ mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) { } -static inline void mem_cgroup_begin_page_stat(struct page *page, +static inline struct mem_cgroup *mem_cgroup_begin_page_stat(struct page *page, bool *locked, unsigned long *flags) { + return NULL; } static inline void mem_cgroup_end_page_stat(struct mem_cgroup *memcg,
|  |