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: In function 'mem_cgroup_force_empty':
mm/memcontrol.c:3761:15: error: 'rec' undeclared (first use in this function)
mm/memcontrol.c:3761:15: note: each undeclared identifier is reported only once for each function it appears in
mm/memcontrol.c:3761:7: error: too many arguments to function 'try_to_free_mem_cgroup_pages'
include/linux/swap.h:254:22: note: declared here

Presumably caused by my bad merge fixup.  I applied the further fix below.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 16 Sep 2011 16:17:52 +1000
Subject: [PATCH] akpm: merge fix up fix for memcg

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

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a505fc9..1faea9b 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3758,7 +3758,7 @@ try_to_free:
 			goto out;
 		}
 		progress = try_to_free_mem_cgroup_pages(memcg, GFP_KERNEL,
-						false, &rec);
+						false);
 		if (!progress) {
 			nr_retries--;
 			/* maybe some writeback is necessary */
-- 
1.7.5.4

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/