linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dong Aisheng <aisheng.dong@nxp.com>
To: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org, dongas86@gmail.com,
	Dong Aisheng <aisheng.dong@nxp.com>
Subject: [PATCH V2 6/6] mm/sparse: remove one duplicated #ifdef CONFIG_SPARSEMEM_EXTREME
Date: Mon, 31 May 2021 17:19:08 +0800	[thread overview]
Message-ID: <20210531091908.1738465-7-aisheng.dong@nxp.com> (raw)
In-Reply-To: <20210531091908.1738465-1-aisheng.dong@nxp.com>

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
 
 /*
-- 
2.25.1


  parent reply	other threads:[~2021-05-31  9:21 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-31  9:19 [PATCH V2 0/6] mm/sparse: a few minor fixes and improvements Dong Aisheng
2021-05-31  9:19 ` [PATCH V2 1/6] mm: drop SECTION_SHIFT in code comments Dong Aisheng
2021-05-31  9:19 ` [PATCH V2 2/6] mm/sparse: free section usage memory in case populate_section_memmap failed Dong Aisheng
2021-05-31 15:06   ` Liam Howlett
2021-06-01  2:37     ` Dong Aisheng
2021-06-01  8:19   ` David Hildenbrand
2021-05-31  9:19 ` [PATCH V2 3/6] mm/sparse: move mem_sections allocation out of memory_present() Dong Aisheng
2021-05-31 14:39   ` Liam Howlett
2021-06-01  2:38     ` Dong Aisheng
2021-06-01  8:22   ` David Hildenbrand
2021-05-31  9:19 ` [PATCH V2 4/6] mm: rename the global section array to mem_sections Dong Aisheng
2021-06-01  8:22   ` David Hildenbrand
2021-06-01  8:37     ` Dong Aisheng
2021-06-01  8:40       ` David Hildenbrand
2021-06-01  8:44         ` Dong Aisheng
2021-06-01 23:52         ` Andrew Morton
2021-06-02  1:11           ` HAGIO KAZUHITO(萩尾　一仁)
2021-06-02  2:26             ` Andrew Morton
2021-06-02  3:03             ` Baoquan He
2021-06-02  5:02               ` HAGIO KAZUHITO(萩尾　一仁)
2021-06-02  5:22                 ` Baoquan He
2021-05-31  9:19 ` [PATCH V2 5/6] mm/page_alloc: improve memmap_pages dbg msg Dong Aisheng
2021-06-01  8:23   ` David Hildenbrand
2021-05-31  9:19 ` Dong Aisheng [this message]
2021-06-01  8:26   ` [PATCH V2 6/6] mm/sparse: remove one duplicated #ifdef CONFIG_SPARSEMEM_EXTREME David Hildenbrand
2021-06-01  8:39     ` Dong Aisheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210531091908.1738465-7-aisheng.dong@nxp.com \
    --to=aisheng.dong@nxp.com \
    --cc=dongas86@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).