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

[Stephen Rothwell]

Hi Andrew,

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

mm/memcontrol.c: In function '__mem_cgroup_iter_next':
mm/memcontrol.c:982:4: error: 'prev_cgroup' undeclared (first use in this function)
    prev_cgroup = next_cgroup;
    ^
mm/memcontrol.c:982:18: error: 'next_cgroup' undeclared (first use in this function)
    prev_cgroup = next_cgroup;
                  ^

I applied this patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 12 Aug 2013 16:04:36 +1000
Subject: [PATCH] memcontrol: further merge fix patch

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

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 624d69e..a367145 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -979,7 +979,7 @@ skip_node:
 
 		switch (mem_cgroup_filter(mem, root, cond)) {
 		case SKIP:
-			prev_cgroup = next_cgroup;
+			prev_css = next_css;
 			goto skip_node;
 		case SKIP_TREE:
 			if (mem == root)
@@ -998,7 +998,7 @@ skip_node:
 			if (css_tryget(&mem->css))
 				return mem;
 			else {
-				prev_cgroup = next_cgroup;
+				prev_css = next_css;
 				goto skip_node;
 			}
 			break;
-- 
1.8.4.rc0

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature