diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /mm/mempolicy.c | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'mm/mempolicy.c')
| -rw-r--r-- | mm/mempolicy.c | 11 |
1 files changed, 11 insertions, 0 deletions
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); } |