On October 19, 2018 11:17:30 AM GMT+03:00, Wei Yang <richard.weiyang@xxxxxxxxx> wrote:
>Which tree it applies?
To mmotm of the end of September.
>On Thu, Sep 27, 2018 at 08:03:45PM +0300, Mike Rapoport wrote:
>>During removal of HAVE_MEMBLOCK definition, the #else clause of the
>>
>> #ifdef CONFIG_HAVE_MEMBLOCK
>> ...
>> #else
>> ...
>> #endif
>>
>>conditional was not removed.
>>
>>Remove it now.
>>
>>Signed-off-by: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
>>Reported-by: Alexander Duyck <alexander.duyck@xxxxxxxxx>
>>Cc: Michal Hocko <mhocko@xxxxxxxx>
>>---
>> include/linux/memblock.h | 5 -----
>> 1 file changed, 5 deletions(-)
>>
>>diff --git a/include/linux/memblock.h b/include/linux/memblock.h
>>index d3bc270..d4d0e01 100644
>>--- a/include/linux/memblock.h
>>+++ b/include/linux/memblock.h
>>@@ -597,11 +597,6 @@ static inline void early_memtest(phys_addr_t
>start, phys_addr_t end)
>> {
>> }
>> #endif
>>-#else
>>-static inline phys_addr_t memblock_alloc(phys_addr_t size,
>phys_addr_t align)
>>-{
>>- return 0;
>>-}
>>
>> #endif /* __KERNEL__ */
>>
>>--
>>2.7.4
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
