diff -druNp --no-dereference linux-libre-4.17.7-gnu/include/linux/mm.h linux-libre-4.17.8-gnu/include/linux/mm.h
--- linux-libre-4.17.7-gnu/include/linux/mm.h	2018-07-17 05:48:36.000000000 -0400
+++ linux-libre-4.17.8-gnu/include/linux/mm.h	2018-07-18 01:56:38.000000000 -0400
@@ -2081,7 +2081,7 @@ extern int __meminit __early_pfn_to_nid(
 					struct mminit_pfnnid_cache *state);
 #endif
 
-#ifdef CONFIG_HAVE_MEMBLOCK
+#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_FLAT_NODE_MEM_MAP)
 void zero_resv_unavail(void);
 #else
 static inline void zero_resv_unavail(void) {}
diff -druNp --no-dereference linux-libre-4.17.7-gnu/Makefile linux-libre-4.17.8-gnu/Makefile
--- linux-libre-4.17.7-gnu/Makefile	2018-07-17 12:23:00.000000000 -0400
+++ linux-libre-4.17.8-gnu/Makefile	2018-07-18 04:40:56.000000000 -0400
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 17
-SUBLEVEL = 7
+SUBLEVEL = 8
 EXTRAVERSION = -gnu
 NAME = Merciless Moray
 
diff -druNp --no-dereference linux-libre-4.17.7-gnu/mm/page_alloc.c linux-libre-4.17.8-gnu/mm/page_alloc.c
--- linux-libre-4.17.7-gnu/mm/page_alloc.c	2018-07-17 05:48:36.000000000 -0400
+++ linux-libre-4.17.8-gnu/mm/page_alloc.c	2018-07-18 01:56:38.000000000 -0400
@@ -6377,7 +6377,7 @@ void __paginginit free_area_init_node(in
 	free_area_init_core(pgdat);
 }
 
-#ifdef CONFIG_HAVE_MEMBLOCK
+#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_FLAT_NODE_MEM_MAP)
 /*
  * Only struct pages that are backed by physical memory are zeroed and
  * initialized by going through __init_single_page(). But, there are some
@@ -6415,7 +6415,7 @@ void __paginginit zero_resv_unavail(void
 	if (pgcnt)
 		pr_info("Reserved but unavailable: %lld pages", pgcnt);
 }
-#endif /* CONFIG_HAVE_MEMBLOCK */
+#endif /* CONFIG_HAVE_MEMBLOCK && !CONFIG_FLAT_NODE_MEM_MAP */
 
 #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
 
