From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tejun Heo <tj@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Vladimir Davydov <vdavydov@parallels.com>,
Andrew Morton <akpm@linux-foundation.org>,
Michal Hocko <mhocko@kernel.org>
Subject: linux-next: build failure after merge of the cgroup tree
Date: Fri, 25 Sep 2015 13:26:00 +1000 [thread overview]
Message-ID: <20150925132600.4b344b30@canb.auug.org.au> (raw)
Hi Tejun,
After merging the cgroup tree, today's linux-next build (x86_64
allmodconfig) failed like this:
mm/vmscan.c: In function 'sane_reclaim':
mm/vmscan.c:178:2: error: implicit declaration of function 'cgroup_on_dfl' [-Werror=implicit-function-declaration]
if (cgroup_on_dfl(memcg->css.cgroup))
^
Caused by commit
d5028f9f7d8d ("vmscan: fix sane_reclaim helper for legacy memcg")
from Linus' tree interacting with commit
9e10a130d9b6 ("cgroup: replace cgroup_on_dfl() tests in controllers with cgroup_subsys_on_dfl()")
from the cgroup tree.
We new this was coming, so I have applied the following merge fix patch from Andrew's tree and can carry it as necessary:
From: Michal Hocko <mhocko@kernel.org>
Subject: vmscan build fix
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/vmscan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/vmscan.c~vmscan-build-fix mm/vmscan.c
--- a/mm/vmscan.c~vmscan-build-fix
+++ a/mm/vmscan.c
@@ -175,7 +175,7 @@ static bool sane_reclaim(struct scan_con
if (!memcg)
return true;
#ifdef CONFIG_CGROUP_WRITEBACK
- if (cgroup_on_dfl(memcg->css.cgroup))
+ if (cgroup_subsys_on_dfl(memory_cgrp_subsys))
return true;
#endif
return false;
_
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
next reply other threads:[~2015-09-25 3:26 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-25 3:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-07 3:38 linux-next: build failure after merge of the cgroup tree Stephen Rothwell
2023-12-07 4:18 ` Waiman Long
2023-07-17 1:34 Stephen Rothwell
2023-07-17 6:45 ` Miaohe Lin
2022-10-31 2:23 Stephen Rothwell
2022-10-31 17:52 ` Tejun Heo
2022-09-12 6:18 Stephen Rothwell
2022-09-12 7:38 ` Peter Zijlstra
2022-09-12 18:44 ` Tejun Heo
2022-09-12 22:16 ` Tejun Heo
2022-09-15 10:46 ` Peter Zijlstra
2022-10-10 20:57 ` Stephen Rothwell
2022-10-10 20:59 ` Tejun Heo
2022-08-29 3:29 Stephen Rothwell
2021-05-11 0:51 Stephen Rothwell
2021-05-11 1:10 ` Roman Gushchin
2021-05-11 1:31 ` Tejun Heo
2021-04-22 6:31 Stephen Rothwell
2014-02-26 6:46 Stephen Rothwell
2014-02-26 13:44 ` Tejun Heo
2013-04-29 4:04 Stephen Rothwell
2013-04-29 22:55 ` Tejun Heo
2013-04-30 1:51 ` Benjamin Herrenschmidt
2012-09-14 3:17 Stephen Rothwell
2012-09-14 6:56 ` Daniel Wagner
2012-09-14 17:00 ` Tejun Heo
2012-09-14 18:32 ` Sedat Dilek
2012-09-14 18:34 ` Tejun Heo
2012-09-15 7:55 ` Sedat Dilek
2011-11-25 3:50 Stephen Rothwell
2011-11-27 19:33 ` Tejun Heo
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=20150925132600.4b344b30@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mhocko@kernel.org \
--cc=tj@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).