From: Andrew Morton <akpm@linux-foundation•org>
To: sedat.dilek@gmail•com
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Li Zefan <lizefan@huawei•com>
Subject: Re: linux-next: Tree for Jul 4
Date: Thu, 4 Jul 2013 01:45:44 -0700 [thread overview]
Message-ID: <20130704014544.bce5cdb6.akpm@linux-foundation.org> (raw)
In-Reply-To: <CA+icZUV8Nw2eY7aJg0qSCmg+Pk_EdRT2joUqxiL8y77rUsBGHg@mail.gmail.com>
On Thu, 4 Jul 2013 10:21:09 +0200 Sedat Dilek <sedat.dilek@gmail•com> wrote:
> I have compared both mm/memcontrol.c files from
> next-20130703/next-20130704 - they are identical.
>
> These hunks...
>
> [ From Li Zefan ]
> @@ -6332,8 +6341,7 @@ static void mem_cgroup_css_free(struct cgroup *cont)
> {
> struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
>
> - mem_cgroup_sockets_destroy(memcg);
> -
> + memcg_destroy_kmem(memcg);
> __mem_cgroup_free(memcg);
> }
>
> [ From mmots ]
> @@ -6399,8 +6408,7 @@ static void mem_cgroup_css_free(struct c
> {
> struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
>
> - mem_cgroup_sockets_destroy(memcg);
> -
> + memcg_destroy_kmem(memcg);
> mem_cgroup_put(memcg);
> }
>
> ...seems to differ.
>
> In both mentioned -next releases there exist no mem_cgroup_put() in
> mm/memcontrol.c.
> So the hunk in mmots seems to be wrong in my eyes.
Seems right - thanks for catching that.
--- a/mm/memcontrol.c~memcg-use-css_get-put-when-charging-uncharging-kmem-fix-fix-fix
+++ a/mm/memcontrol.c
@@ -6409,7 +6409,7 @@ static void mem_cgroup_css_free(struct c
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
memcg_destroy_kmem(memcg);
- mem_cgroup_put(memcg);
+ __mem_cgroup_free(memcg);
}
#ifdef CONFIG_MMU
_
next prev parent reply other threads:[~2013-07-04 8:45 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-04 6:06 linux-next: Tree for Jul 4 Stephen Rothwell
2013-07-04 7:41 ` Sedat Dilek
2013-07-04 8:21 ` Sedat Dilek
2013-07-04 8:40 ` Sedat Dilek
2013-07-04 8:45 ` Andrew Morton [this message]
2013-07-04 9:12 ` Sedat Dilek
-- strict thread matches above, loose matches on Subject: below --
2014-07-04 6:42 Stephen Rothwell
2014-07-04 8:42 ` Sachin Kamat
2014-07-04 15:10 ` Stephen Rothwell
2014-07-05 0:48 ` J. Bruce Fields
2014-07-05 14:57 ` Sachin Kamat
2014-07-06 4:54 ` Nick Krause
2014-07-06 5:17 ` Nick Krause
2014-07-06 5:21 ` Nick Krause
2014-07-06 5:34 ` Nick Krause
2014-07-06 5:42 ` Nick Krause
2014-07-05 14:56 ` Sachin Kamat
2016-07-04 8:43 Stephen Rothwell
2017-07-04 5:44 Stephen Rothwell
2018-07-04 5:57 Stephen Rothwell
2019-07-04 12:09 Stephen Rothwell
2019-07-04 12:24 ` Stephen Rothwell
2019-07-04 12:40 ` Greg Kroah-Hartman
2019-07-06 8:34 ` Greg Kroah-Hartman
2019-07-06 9:44 ` Stephen Rothwell
2019-07-06 9:46 ` Greg Kroah-Hartman
2019-07-06 10:17 ` Stephen Rothwell
2019-07-06 14:33 ` Greg Kroah-Hartman
2019-07-06 15:42 ` Greg Kroah-Hartman
2022-07-04 8:21 Stephen Rothwell
2023-07-04 3:43 Stephen Rothwell
2025-07-04 10:51 Stephen Rothwell
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=20130704014544.bce5cdb6.akpm@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lizefan@huawei$(echo .)com \
--cc=sedat.dilek@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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