From: Michal Hocko <mhocko@kernel.org>
To: Johannes Weiner <hannes@cmpxchg.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Shaohua Li <shli@fb.com>, Ben Hutchings <ben@decadent.org.uk>,
Vladimir Davydov <vdavydov@parallels.com>,
linux-mm@kvack.org, LKML <linux-kernel@vger.kernel.org>,
stable@vger.kernel.org
Subject: Re: [PATCH] memcg: Fix thresholds for 32b architectures.
Date: Tue, 27 Oct 2015 19:25:08 +0100 [thread overview]
Message-ID: <20151027182508.GA23297@dhcp22.suse.cz> (raw)
In-Reply-To: <20151027162331.GA7749@cmpxchg.org>
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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
prev parent reply other threads:[~2015-10-27 18:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 10:37 [PATCH] memcg: Fix thresholds for 32b architectures mhocko
2015-10-27 15:22 ` Vladimir Davydov
2015-10-27 16:23 ` Johannes Weiner
2015-10-27 18:25 ` Michal Hocko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151027182508.GA23297@dhcp22.suse.cz \
--to=mhocko@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=ben@decadent.org.uk \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=shli@fb.com \
--cc=stable@vger.kernel.org \
--cc=vdavydov@parallels.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).