Thread (27 messages) 27 messages, 8 authors, 2021-06-02

Re: [PATCH V2 6/6] mm/sparse: remove one duplicated #ifdef CONFIG_SPARSEMEM_EXTREME

From: David Hildenbrand <hidden>
Date: 2021-06-01 08:26:17
Also in: lkml

On 31.05.21 11:19, Dong Aisheng wrote:
quoted hunk ↗ jump to hunk
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@nxp.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 <redacted>

-- 
Thanks,

David / dhildenb

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help