From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 26 Apr 2010 22:22:26 +0000 (-0700)
Subject: build fix for a .33 patch
X-Git-Tag: v2.6.32.13~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=836084f73cc228e72340f4ed37c2f95e9b63ef40;p=thirdparty%2Fkernel%2Fstable-queue.git

build fix for a .33 patch
---

diff --git a/queue-2.6.33/memcg-fix-prepare-migration.patch b/queue-2.6.33/memcg-fix-prepare-migration.patch
index c5c2420883c..297b0770ca0 100644
--- a/queue-2.6.33/memcg-fix-prepare-migration.patch
+++ b/queue-2.6.33/memcg-fix-prepare-migration.patch
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +	*ptr = mem;
  	if (mem) {
 -		ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, &mem, false,
-+		ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, ptr, false
++		ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, ptr, false,
  						page);
  		css_put(&mem->css);
  	}