[PATCH v2 67/69] mm/cma: Move init_cma_pageblock() into cma.c

[Muchun Song]

Move init_cma_pageblock() from mm_init.c into cma.c so it lives
alongside the CMA code that uses it.

No functional change intended.
---
 mm/cma.c      | 8 ++++++++
 mm/internal.h | 4 ----
 mm/mm_init.c  | 9 ---------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/mm/cma.c b/mm/cma.c
index c1896c0db63d..2843c4f59c4e 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -30,6 +30,7 @@
 #include <linux/io.h>
 #include <linux/kmemleak.h>
 #include <trace/events/cma.h>
+#include <linux/page-isolation.h>
 
 #include "internal.h"
 #include "cma.h"
@@ -137,6 +138,13 @@ bool cma_validate_zones(struct cma *cma)
        return true;
 }
 
+static void __init init_cma_pageblock(struct page *page)
+{
+       init_pageblock_migratetype(page, MIGRATE_CMA, false);
+       adjust_managed_page_count(page, pageblock_nr_pages);
+       page_zone(page)->cma_pages += pageblock_nr_pages;
+}
+
 static void __init cma_activate_area(struct cma *cma)
 {
        unsigned long pfn, end_pfn, early_pfn[CMA_MAX_RANGES];
diff --git a/mm/internal.h b/mm/internal.h
index 80b9ab594dc5..25b6e767cea0 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1126,7 +1126,6 @@ struct cma;
 #ifdef CONFIG_CMA
 bool cma_validate_zones(struct cma *cma);
 void *cma_reserve_early(struct cma *cma, unsigned long size);
-void init_cma_pageblock(struct page *page);
 #else
 static inline bool cma_validate_zones(struct cma *cma)
 {
@@ -1136,9 +1135,6 @@ static inline void *cma_reserve_early(struct cma *cma, 
unsigned long size)
 {
        return NULL;
 }
-static inline void init_cma_pageblock(struct page *page)
-{
-}
 #endif
 
 
diff --git a/mm/mm_init.c b/mm/mm_init.c
index 1e11fd683292..ff6e9fb468bd 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -2200,15 +2200,6 @@ void __init init_cma_reserved_pageblock(struct page 
*page)
        adjust_managed_page_count(page, pageblock_nr_pages);
        page_zone(page)->cma_pages += pageblock_nr_pages;
 }
-/*
- * Similar to above, but only set the migrate type and stats.
- */
-void __init init_cma_pageblock(struct page *page)
-{
-       init_pageblock_migratetype(page, MIGRATE_CMA, false);
-       adjust_managed_page_count(page, pageblock_nr_pages);
-       page_zone(page)->cma_pages += pageblock_nr_pages;
-}
 #endif
 
 void set_zone_contiguous(struct zone *zone)
-- 
2.54.0