linux-kernel - Re: [PATCH V2 6/6] mm/sparse: remove one duplicated #ifdef CONFIG_SPARSEMEM

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <274fb19f-d14c-bb45-b69a-a7c8b4c1722e@redhat.com>
Date:   Tue, 1 Jun 2021 10:26:09 +0200
From:   David Hildenbrand <david@...hat.com>
To:     Dong Aisheng <aisheng.dong@....com>, linux-mm@...ck.org
Cc:     linux-kernel@...r.kernel.org, dongas86@...il.com
Subject: Re: [PATCH V2 6/6] mm/sparse: remove one duplicated #ifdef
 CONFIG_SPARSEMEM_EXTREME

On 31.05.21 11:19, Dong Aisheng wrote:
> Those two blocks of code contained by #ifdef CONFIG_SPARSEMEM_EXTREME
> condition are right along with each other. Not need using another #ifdef
> condition.
> 
> Signed-off-by: Dong Aisheng <aisheng.dong@....com>
> ---
> ChangeLog:
>   *new patch
> ---
>   mm/sparse.c | 18 ++++++++----------
>   1 file changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/mm/sparse.c b/mm/sparse.c
> index 6412010478f7..2905ee9fde10 100644
> --- a/mm/sparse.c
> +++ b/mm/sparse.c
> @@ -114,16 +114,7 @@ static int __meminit sparse_index_init(unsigned long section_nr, int nid)
>   
>   	return 0;
>   }
> -#else /* !SPARSEMEM_EXTREME */
> -static inline int sparse_index_init(unsigned long section_nr, int nid)
> -{
> -	return 0;
> -}
>   
> -static inline void sparse_alloc_section_roots(void) {}
> -#endif
> -
> -#ifdef CONFIG_SPARSEMEM_EXTREME
>   unsigned long __section_nr(struct mem_section *ms)
>   {
>   	unsigned long root_nr;
> @@ -142,11 +133,18 @@ unsigned long __section_nr(struct mem_section *ms)
>   
>   	return (root_nr * SECTIONS_PER_ROOT) + (ms - root);
>   }
> -#else
> +#else /* !SPARSEMEM_EXTREME */
> +static inline int sparse_index_init(unsigned long section_nr, int nid)
> +{
> +	return 0;
> +}
> +
>   unsigned long __section_nr(struct mem_section *ms)
>   {
>   	return (unsigned long)(ms - mem_sections[0]);
>   }
> +
> +static inline void sparse_alloc_section_roots(void) {}
>   #endif

Want to tag that one (endif) with /* SPARSEMEM_EXTREME */ as well while 
at it?

Acked-by: David Hildenbrand <david@...hat.com>

-- 
Thanks,

David / dhildenb