2018-09-27 17:06:37

by Mike Rapoport

Subject: [PATCH] memblock: remove stale #else and the code it protects

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 <[email protected]>
Reported-by: Alexander Duyck <[email protected]>
Cc: Michal Hocko <[email protected]>
---
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

2018-10-19 08:18:17

by Wei Yang

Subject: Re: [PATCH] memblock: remove stale #else and the code it protects

Which tree it applies?

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 <[email protected]>
>Reported-by: Alexander Duyck <[email protected]>
>Cc: Michal Hocko <[email protected]>
>---
> 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

--
Wei Yang
Help you, Help me

2018-10-21 07:31:31

by Mike Rapoport

Subject: Re: [PATCH] memblock: remove stale #else and the code it protects

On October 19, 2018 11:17:30 AM GMT+03:00, Wei Yang <[email protected]> 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 <[email protected]>
>>Reported-by: Alexander Duyck <[email protected]>
>>Cc: Michal Hocko <[email protected]>
>>---
>> 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.

2018-10-22 01:37:37

by Wei Yang

Subject: Re: [PATCH] memblock: remove stale #else and the code it protects

On Sun, Oct 21, 2018 at 10:30:16AM +0300, Mike Rapoport wrote:
>
>
>On October 19, 2018 11:17:30 AM GMT+03:00, Wei Yang <[email protected]> wrote:
>>Which tree it applies?
>
>To mmotm of the end of September.
>

I may lost some background of this change.

The file I am looking at is
https://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git/tree/include/linux/memblock.h
which has CONFIG_HAVE_MEMBLOCK in line 5.

>>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 <[email protected]>
>>>Reported-by: Alexander Duyck <[email protected]>
>>>Cc: Michal Hocko <[email protected]>
>>>---
>>> 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;
>>>-}
>>>

And in that file, here is memblock_reserved_memory_within.

I guess this is not the version you are trying to fix.

BTW, if you could put the commit SHA which removes the
CONFIG_HAVE_MEMBLOCK, it would be easier for others to catch up.

>>> #endif /* __KERNEL__ */
>>>
>>>--
>>>2.7.4
>
>--
>Sent from my Android device with K-9 Mail. Please excuse my brevity.

--
Wei Yang
Help you, Help me