From: Mike Rapoport <rppt@linux.vnet.ibm.com>
To: Tony Luck <tony.luck@intel.com>, Fenghua Yu <fenghua.yu@intel.com>
Cc: Michal Hocko <mhocko@kernel.org>,
linux-ia64@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
Mike Rapoport <rppt@linux.vnet.ibm.com>
Subject: [PATCH 1/4] ia64: contig/paging_init: reduce code duplication
Date: Mon, 23 Jul 2018 05:56:55 +0000 [thread overview]
Message-ID: <1532325418-22617-2-git-send-email-rppt@linux.vnet.ibm.com> (raw)
In-Reply-To: <1532325418-22617-1-git-send-email-rppt@linux.vnet.ibm.com>
The FLATMEM version of paging_init has calls to free_area_init_nodes() in
the end of every branch of 'if' and 'ifdef' statements.
Let's call this function outside the 'ifdef' and 'if' statements instead.
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
---
arch/ia64/mm/contig.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 7d64b30..1835144 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -248,7 +248,6 @@ paging_init (void)
efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);
if (max_gap < LARGE_GAP) {
vmem_map = (struct page *) 0;
- free_area_init_nodes(max_zone_pfns);
} else {
unsigned long map_size;
@@ -266,13 +265,12 @@ paging_init (void)
*/
NODE_DATA(0)->node_mem_map = vmem_map +
find_min_pfn_with_active_regions();
- free_area_init_nodes(max_zone_pfns);
printk("Virtual mem_map starts at 0x%p\n", mem_map);
}
#else /* !CONFIG_VIRTUAL_MEM_MAP */
memblock_add_node(0, PFN_PHYS(max_low_pfn), 0);
- free_area_init_nodes(max_zone_pfns);
#endif /* !CONFIG_VIRTUAL_MEM_MAP */
+ free_area_init_nodes(max_zone_pfns);
zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
}
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@linux.vnet.ibm.com>
To: Tony Luck <tony.luck@intel.com>, Fenghua Yu <fenghua.yu@intel.com>
Cc: Michal Hocko <mhocko@kernel.org>,
linux-ia64@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
Mike Rapoport <rppt@linux.vnet.ibm.com>
Subject: [PATCH 1/4] ia64: contig/paging_init: reduce code duplication
Date: Mon, 23 Jul 2018 08:56:55 +0300 [thread overview]
Message-ID: <1532325418-22617-2-git-send-email-rppt@linux.vnet.ibm.com> (raw)
In-Reply-To: <1532325418-22617-1-git-send-email-rppt@linux.vnet.ibm.com>
The FLATMEM version of paging_init has calls to free_area_init_nodes() in
the end of every branch of 'if' and 'ifdef' statements.
Let's call this function outside the 'ifdef' and 'if' statements instead.
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
---
arch/ia64/mm/contig.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 7d64b30..1835144 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -248,7 +248,6 @@ paging_init (void)
efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);
if (max_gap < LARGE_GAP) {
vmem_map = (struct page *) 0;
- free_area_init_nodes(max_zone_pfns);
} else {
unsigned long map_size;
@@ -266,13 +265,12 @@ paging_init (void)
*/
NODE_DATA(0)->node_mem_map = vmem_map +
find_min_pfn_with_active_regions();
- free_area_init_nodes(max_zone_pfns);
printk("Virtual mem_map starts at 0x%p\n", mem_map);
}
#else /* !CONFIG_VIRTUAL_MEM_MAP */
memblock_add_node(0, PFN_PHYS(max_low_pfn), 0);
- free_area_init_nodes(max_zone_pfns);
#endif /* !CONFIG_VIRTUAL_MEM_MAP */
+ free_area_init_nodes(max_zone_pfns);
zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
}
--
2.7.4
next prev parent reply other threads:[~2018-07-23 5:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-23 5:56 [PATCH 0/4] ia64: switch to NO_BOOTMEM Mike Rapoport
2018-07-23 5:56 ` Mike Rapoport
2018-07-23 5:56 ` Mike Rapoport [this message]
2018-07-23 5:56 ` [PATCH 1/4] ia64: contig/paging_init: reduce code duplication Mike Rapoport
2018-07-23 5:56 ` [PATCH 2/4] ia64: remove unused num_dma_physpages member from 'struct early_node_data' Mike Rapoport
2018-07-23 5:56 ` Mike Rapoport
2018-07-23 5:56 ` [PATCH 3/4] ia64: use mem_data to detect nodes' minimal and maximal PFNs Mike Rapoport
2018-07-23 5:56 ` Mike Rapoport
2018-07-23 5:56 ` [PATCH 4/4] ia64: switch to NO_BOOTMEM Mike Rapoport
2018-07-23 5:56 ` Mike Rapoport
2018-07-23 21:00 ` [PATCH 0/4] " Luck, Tony
2018-07-23 21:00 ` Luck, Tony
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=1532325418-22617-2-git-send-email-rppt@linux.vnet.ibm.com \
--to=rppt@linux.vnet.ibm.com \
--cc=fenghua.yu@intel.com \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=tony.luck@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.