Merge tag 'for-4.20-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[linux.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index 10b07eea9a6e450ae2a397351959c624eafe66ad..67ad061f7fb8b1b4a38af7a5f69913f6c4f39e70 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -696,13 +696,11 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat,
                goto out;
        }
 
-#ifdef CONFIG_DEBUG_VM
        /*
         * Poison uninitialized struct pages in order to catch invalid flags
         * combinations.
         */
-       memset(memmap, PAGE_POISON_PATTERN, sizeof(struct page) * PAGES_PER_SECTION);
-#endif
+       page_init_poison(memmap, sizeof(struct page) * PAGES_PER_SECTION);
 
        section_mark_present(ms);
        sparse_init_one_section(ms, section_nr, memmap, usemap);