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

[linux.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index 237944479d25a81483a7d6969cfab05c6f0a4c25..a85315083b5a8d1fbba19329a5b77dc7fe3b6da3 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1444,10 +1444,9 @@ void * __init memblock_virt_alloc_try_nid_raw(
 
        ptr = memblock_virt_alloc_internal(size, align,
                                           min_addr, max_addr, nid);
-#ifdef CONFIG_DEBUG_VM
        if (ptr && size > 0)
-               memset(ptr, PAGE_POISON_PATTERN, size);
-#endif
+               page_init_poison(ptr, size);
+
        return ptr;
 }