Re: [PATCH 03/30] mm: remove CONFIG_HAVE_MEMBLOCK
From: Alexander Duyck <hidden>
Date: 2018-09-26 16:58:56
Also in:
linux-alpha, linux-mm, linux-riscv, linux-s390, linux-sh, linux-um, linuxppc-dev, lkml, sparclinux
On Fri, Sep 14, 2018 at 5:11 AM Mike Rapoport [off-list ref] wrote:
All architecures use memblock for early memory management. There is no need for the CONFIG_HAVE_MEMBLOCK configuration option. Signed-off-by: Mike Rapoport <redacted>
<snip>
quoted hunk ↗ jump to hunk
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 5169205..4ae91fc 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h@@ -2,7 +2,6 @@ #define _LINUX_MEMBLOCK_H #ifdef __KERNEL__ -#ifdef CONFIG_HAVE_MEMBLOCK /* * Logical memory blocks. *@@ -460,7 +459,6 @@ static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align) { return 0; } -#endif /* CONFIG_HAVE_MEMBLOCK */ #endif /* __KERNEL__ */
There was an #else above this section and I believe it and the code after it needs to be stripped as well.