Merge branch '2.6.33.4' into rt/2.6.33

Conflicts:
	Makefile

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d3e716fbab13..e5f611db3da0 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2217,12 +2217,12 @@ int mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr)
         }
         unlock_page_cgroup(pc);
 
+        *ptr = mem;
         if (mem) {
-                ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, &mem, false,
+                ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, ptr, false,
                                                 page);
                 css_put(&mem->css);
         }
-        *ptr = mem;
         return ret;
 }