aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/gfp.h
diff options
context:
space:
mode:
authorMichal Nazarewicz <mina86@mina86.com>2012-04-03 09:06:15 -0400
committerMarek Szyprowski <m.szyprowski@samsung.com>2012-05-21 09:09:33 -0400
commit0815f3d81d76dfbf2abcfd93a85ff0a6008fe4c0 (patch)
tree750e239c7c522a206bb04bd8bfcd89c3bf3be30d /include/linux/gfp.h
parent47118af076f64844b4f423bc2f545b2da9dab50d (diff)
mm: page_isolation: MIGRATE_CMA isolation functions added
This commit changes various functions that change pages and pageblocks migrate type between MIGRATE_ISOLATE and MIGRATE_MOVABLE in such a way as to allow to work with MIGRATE_CMA migrate type. Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Tested-by: Rob Clark <rob.clark@linaro.org> Tested-by: Ohad Ben-Cohen <ohad@wizery.com> Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Tested-by: Robert Nelson <robertcnelson@gmail.com> Tested-by: Barry Song <Baohua.Song@csr.com>
Diffstat (limited to 'include/linux/gfp.h')
-rw-r--r--include/linux/gfp.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 78d32a7be257..1e49be49d324 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -394,7 +394,8 @@ static inline bool pm_suspended_storage(void)
394#ifdef CONFIG_CMA 394#ifdef CONFIG_CMA
395 395
396/* The below functions must be run on a range from a single zone. */ 396/* The below functions must be run on a range from a single zone. */
397extern int alloc_contig_range(unsigned long start, unsigned long end); 397extern int alloc_contig_range(unsigned long start, unsigned long end,
398 unsigned migratetype);
398extern void free_contig_range(unsigned long pfn, unsigned nr_pages); 399extern void free_contig_range(unsigned long pfn, unsigned nr_pages);
399 400
400/* CMA stuff */ 401/* CMA stuff */