linux-next: build failure after merge of the akpm tree

[Stephen Rothwell]

Hi Andrew,

After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

mm/memcontrol.c:5269:12: error: 'CFTYPE_INSANE' undeclared here (not in a function)
   .flags = CFTYPE_INSANE,
            ^

Caused by commit 8fa6a8baeffc ("memcg: deprecate memory.force_empty
knob") interacting with commits a8ddc8215e1a ("cgroup: distinguish the
default and legacy hierarchies when handling cftypes") and 05ebb6e60f04
("cgroup: make CFTYPE_ONLY_ON_DFL and CFTYPE_NO_ internal to cgroup
core") from the cgroup tree.

I applied the following fix up patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 16 Jul 2014 18:20:59 +1000
Subject: [PATCH] memcg-deprecate-memoryforce_empty-knob-fix2

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 mm/memcontrol.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 8fa6602a32cd..e1c9699b157b 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5266,7 +5266,6 @@ static struct cftype mem_cgroup_files[] = {
 	},
 	{
 		.name = "force_empty",
-		.flags = CFTYPE_INSANE,
 		.write = mem_cgroup_force_empty_write,
 	},
 	{
-- 
2.0.1


-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: signature.asc
Description: PGP signature