From 2489007e7d740ccbc3e0a202914e243ad5178787 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sat, 22 Sep 2012 09:48:20 +0200 Subject: merge opensource jb u5 Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2 --- mm/mempolicy.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'mm/mempolicy.c') diff --git a/mm/mempolicy.c b/mm/mempolicy.c index a85171d..703b42a 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -932,8 +932,13 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest, return PTR_ERR(vma); if (!list_empty(&pagelist)) { +#ifndef CONFIG_DMA_CMA err = migrate_pages(&pagelist, new_node_page, dest, false, true); +#else + err = migrate_pages(&pagelist, new_node_page, dest, + false, true, 0); +#endif if (err) putback_lru_pages(&pagelist); } @@ -1152,9 +1157,15 @@ static long do_mbind(unsigned long start, unsigned long len, err = mbind_range(mm, start, end, new); if (!list_empty(&pagelist)) { +#ifndef CONFIG_DMA_CMA nr_failed = migrate_pages(&pagelist, new_vma_page, (unsigned long)vma, false, true); +#else + nr_failed = migrate_pages(&pagelist, new_vma_page, + (unsigned long)vma, + false, true, 0); +#endif if (nr_failed) putback_lru_pages(&pagelist); } -- cgit v1.1