commit: f918c66c6091276f7ffd7c8aae48471c08334cdb Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Wed Jul 18 11:18:25 2018 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Wed Jul 18 11:18:25 2018 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=f918c66c
Linux patch 4.17.8 0000_README | 4 ++++ 1007_linux-4.17.8.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/0000_README b/0000_README index a165e9a..5c3b875 100644 --- a/0000_README +++ b/0000_README @@ -71,6 +71,10 @@ Patch: 1006_linux-4.17.7.patch From: http://www.kernel.org Desc: Linux 4.17.7 +Patch: 1007_linux-4.17.8.patch +From: http://www.kernel.org +Desc: Linux 4.17.8 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1007_linux-4.17.8.patch b/1007_linux-4.17.8.patch new file mode 100644 index 0000000..bfe8221 --- /dev/null +++ b/1007_linux-4.17.8.patch @@ -0,0 +1,48 @@ +diff --git a/Makefile b/Makefile +index 5c9f331f29c0..7cc36fe18dbb 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 4 + PATCHLEVEL = 17 +-SUBLEVEL = 7 ++SUBLEVEL = 8 + EXTRAVERSION = + NAME = Merciless Moray + +diff --git a/include/linux/mm.h b/include/linux/mm.h +index 02a616e2f17d..d14261d6b213 100644 +--- a/include/linux/mm.h ++++ b/include/linux/mm.h +@@ -2081,7 +2081,7 @@ extern int __meminit __early_pfn_to_nid(unsigned long pfn, + 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 --git a/mm/page_alloc.c b/mm/page_alloc.c +index 322cb12a142f..7b841a764dd0 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -6377,7 +6377,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, + 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 +
