aboutsummaryrefslogtreecommitdiffstats
path: root/mm/migrate.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-01 09:58:15 -0500
committerTakashi Iwai <tiwai@suse.de>2009-12-01 09:58:15 -0500
commitb00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch)
treedde815788aaea3e336aaaf24763311ce63a22e1b /mm/migrate.c
parent75639e7ee1401b3876c7a00ffe96ea8027668690 (diff)
parentd6797322231af98b9bb4afb175dd614cf511e5f7 (diff)
Merge branch 'topic/pcm-dma-fix' into topic/core-change
Diffstat (limited to 'mm/migrate.c')
-rw-r--r--mm/migrate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c
index 1a4bf4813780..7dbcb22316d2 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -602,7 +602,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
602 struct page *newpage = get_new_page(page, private, &result); 602 struct page *newpage = get_new_page(page, private, &result);
603 int rcu_locked = 0; 603 int rcu_locked = 0;
604 int charge = 0; 604 int charge = 0;
605 struct mem_cgroup *mem; 605 struct mem_cgroup *mem = NULL;
606 606
607 if (!newpage) 607 if (!newpage)
608 return -ENOMEM; 608 return -ENOMEM;