Messages in this thread Patch in this message | | | Date | Tue, 27 Oct 2015 19:25:08 +0100 | From | Michal Hocko <> | Subject | Re: [PATCH] memcg: Fix thresholds for 32b architectures. |
| |
On Tue 27-10-15 09:23:31, Johannes Weiner wrote: [...] > > Fixes: 424cdc141380 ("memcg: convert threshold to bytes") > > Fixes: 3e32cb2e0a12 ("mm: memcontrol: lockless page counters") > > CC: stable@vger.kernel.org > > Reported-by: Ben Hutchings <ben@decadent.org.uk> > > Signed-off-by: Michal Hocko <mhocko@suse.com> > > Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Thanks!
> > > +++ b/mm/memcontrol.c > > @@ -2802,7 +2802,7 @@ static unsigned long tree_stat(struct mem_cgroup *memcg, > > return val; > > } > > > > -static inline u64 mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) > > +static inline unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) > > { > > u64 val; > > Minor nit, but this should probably be unsigned long now.
Yeah, I've missed this. Andrew, do you want me to post a new version or you can fold a trivial update here? --- diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 2823cafc269e..f4c09c4e895f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2804,7 +2804,7 @@ static unsigned long tree_stat(struct mem_cgroup *memcg, static inline unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) { - u64 val; + unsigned long val; if (mem_cgroup_is_root(memcg)) { val = tree_stat(memcg, MEM_CGROUP_STAT_CACHE); -- Michal Hocko SUSE Labs
| |