diff --git a/[refs] b/[refs] index 207471ccc593..7cedb0764543 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9f9d4706cb1b706f89f98ea6ead41ebecdefbc2 +refs/heads/master: e00e431612c3a6e437a01f2129fd3843da0c982a diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c index 1a4bf4813780..7dbcb22316d2 100644 --- a/trunk/mm/migrate.c +++ b/trunk/mm/migrate.c @@ -602,7 +602,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private, struct page *newpage = get_new_page(page, private, &result); int rcu_locked = 0; int charge = 0; - struct mem_cgroup *mem; + struct mem_cgroup *mem = NULL; if (!newpage) return -ENOMEM;