Merge branch 'akpm' (patches from Andrew)

[firefly-linux-kernel-4.4.55.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4a4c399bacebe122db03f5fe63d0198fae17df94..48aaf7b9f253e6ea68587caa1e7e3e254905936a 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -224,6 +224,9 @@ static char * const zone_names[MAX_NR_ZONES] = {
         "HighMem",
 #endif
         "Movable",
+#ifdef CONFIG_ZONE_DEVICE
+        "Device",
+#endif
 };
 
 int min_free_kbytes = 1024;