[PATCH 1/2] mm: Move definition of 'zone_names' array into mmzone.h

From: Anshuman Khandual
Date: Tue Aug 30 2016 - 23:27:07 EST


zone_names[] is used to identify any zone given it's index which
can be used in many other places. So moving the definition into
include/linux/mmzone.h for broader access.

Signed-off-by: Anshuman Khandual <khandual@xxxxxxxxxxxxxxxxxx>
---
include/linux/mmzone.h | 17 +++++++++++++++++
mm/page_alloc.c | 17 -----------------
2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index d572b78..01ca3f4 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -341,6 +341,23 @@ enum zone_type {

};

+static char * const zone_names[__MAX_NR_ZONES] = {
+#ifdef CONFIG_ZONE_DMA
+ "DMA",
+#endif
+#ifdef CONFIG_ZONE_DMA32
+ "DMA32",
+#endif
+ "Normal",
+#ifdef CONFIG_HIGHMEM
+ "HighMem",
+#endif
+ "Movable",
+#ifdef CONFIG_ZONE_DEVICE
+ "Device",
+#endif
+};
+
#ifndef __GENERATING_BOUNDS_H

struct zone {
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3fbe73a..8e2261c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -207,23 +207,6 @@ int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES-1] = {

EXPORT_SYMBOL(totalram_pages);

-static char * const zone_names[MAX_NR_ZONES] = {
-#ifdef CONFIG_ZONE_DMA
- "DMA",
-#endif
-#ifdef CONFIG_ZONE_DMA32
- "DMA32",
-#endif
- "Normal",
-#ifdef CONFIG_HIGHMEM
- "HighMem",
-#endif
- "Movable",
-#ifdef CONFIG_ZONE_DEVICE
- "Device",
-#endif
-};
-
char * const migratetype_names[MIGRATE_TYPES] = {
"Unmovable",
"Movable",
--
1.9.3