LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: David Miller <davem@davemloft.net>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 11/11] memblock: Move __alloc_memory_core_early() to nobootmem.c
Date: Mon,  7 Feb 2011 15:17:12 -0800	[thread overview]
Message-ID: <1297120632-24933-12-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1297120632-24933-1-git-send-email-yinghai@kernel.org>

We can remove #ifdef in mm/page_alloc.c

and change that function to static

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 include/linux/mm.h |    2 --
 mm/nobootmem.c     |   25 +++++++++++++++++++++++++
 mm/page_alloc.c    |   28 ----------------------------
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index f6385fc..679300c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1309,8 +1309,6 @@ int add_from_early_node_map(struct range *range, int az,
 				   int nr_range, int nid);
 u64 __init find_memory_core_early(int nid, u64 size, u64 align,
 					u64 goal, u64 limit);
-void *__alloc_memory_core_early(int nodeid, u64 size, u64 align,
-				 u64 goal, u64 limit);
 typedef int (*work_fn_t)(unsigned long, unsigned long, void *);
 extern void work_with_active_regions(int nid, work_fn_t work_fn, void *data);
 extern void sparse_memory_present_with_active_regions(int nid);
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index 6a018e4..e2bdb07 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -40,6 +40,31 @@ unsigned long max_pfn;
 unsigned long saved_max_pfn;
 #endif
 
+static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
+					u64 goal, u64 limit)
+{
+	void *ptr;
+	u64 addr;
+
+	if (limit > memblock.current_limit)
+		limit = memblock.current_limit;
+
+	addr = find_memory_core_early(nid, size, align, goal, limit);
+
+	if (addr == MEMBLOCK_ERROR)
+		return NULL;
+
+	ptr = phys_to_virt(addr);
+	memset(ptr, 0, size);
+	memblock_x86_reserve_range(addr, addr + size, "BOOTMEM");
+	/*
+	 * The min_count is set to 0 so that bootmem allocated blocks
+	 * are never reported as leaks.
+	 */
+	kmemleak_alloc(ptr, size, 0, 0);
+	return ptr;
+}
+
 /*
  * free_bootmem_late - free bootmem pages directly to page allocator
  * @addr: starting address of the range
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a243a7f..6035136 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3780,34 +3780,6 @@ int __init add_from_early_node_map(struct range *range, int az,
 	return nr_range;
 }
 
-#ifdef CONFIG_NO_BOOTMEM
-void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
-					u64 goal, u64 limit)
-{
-	void *ptr;
-	u64 addr;
-
-	if (limit > memblock.current_limit)
-		limit = memblock.current_limit;
-
-	addr = find_memory_core_early(nid, size, align, goal, limit);
-
-	if (addr == MEMBLOCK_ERROR)
-		return NULL;
-
-	ptr = phys_to_virt(addr);
-	memset(ptr, 0, size);
-	memblock_x86_reserve_range(addr, addr + size, "BOOTMEM");
-	/*
-	 * The min_count is set to 0 so that bootmem allocated blocks
-	 * are never reported as leaks.
-	 */
-	kmemleak_alloc(ptr, size, 0, 0);
-	return ptr;
-}
-#endif
-
-
 void __init work_with_active_regions(int nid, work_fn_t work_fn, void *data)
 {
 	int i;
-- 
1.7.1


  parent reply	other threads:[~2011-02-07 23:54 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-07 23:17 [PATCH -v2 0/11] x86: memblock related cleanup Yinghai Lu
2011-02-07 23:17 ` [PATCH 01/11] memblock: Don't adjust size in memblock_find_base() Yinghai Lu
2011-02-07 23:17 ` [PATCH 02/11] x86, mm, 64bit: Put early page table high Yinghai Lu
2011-02-07 23:17 ` [PATCH 03/11] x86, 64bit, gart: Fix allocation with memblock Yinghai Lu
2011-02-07 23:17 ` [PATCH 04/11] memblock: Make find_memory_core_early() find from top-down Yinghai Lu
2011-02-07 23:17 ` [PATCH 05/11] x86: Change get_max_mapped() to inline Yinghai Lu
2011-02-07 23:17 ` [PATCH 06/11] x86, 64bit, numa: Allocate memnodemap under max_pfn_mapped Yinghai Lu
2011-02-07 23:17 ` [PATCH 07/11] x86, 64bit, numa: Put pgtable to local node memory Yinghai Lu
2011-02-07 23:17 ` [PATCH 08/11] x86: Rename e820_table_* to pgt_buf_* Yinghai Lu
2011-02-07 23:17 ` [PATCH 09/11] bootmem: Add nobootmem.c to reduce the #ifdef Yinghai Lu
2011-02-07 23:17 ` [PATCH 10/11] mm: Move contig_page_data define to bootmem.c/nobootmem.c Yinghai Lu
2011-02-22 23:48   ` Andrew Morton
2011-02-24  7:11     ` [PATCH 0/3] mm: Split bootmem.c for nobootmem support Yinghai Lu
     [not found]     ` <4D660375.10005@kernel.org>
2011-02-24  7:11       ` [PATCH 1/3] bootmem: Add nobootmem.c to reduce the #ifdef Yinghai Lu
2011-02-24 13:57         ` [PATCH] bootmem: Separate out CONFIG_NO_BOOTMEM code into nobootmem.c Tejun Heo
2011-02-24  7:12       ` [PATCH 2/3] mm: Move contig_page_data define to bootmem.c/nobootmem.c Yinghai Lu
2011-02-24 13:58         ` [PATCH] bootmem: Move contig_page_data definition " Tejun Heo
2011-02-24  7:12       ` [PATCH 3/3] memblock: Move __alloc_memory_core_early() to nobootmem.c Yinghai Lu
2011-02-24 13:59         ` [PATCH] bootmem: " Tejun Heo
2011-02-07 23:17 ` Yinghai Lu [this message]
2011-02-15  6:37 ` [PATCH -v2 0/11] x86: memblock related cleanup Yinghai Lu

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=1297120632-24933-12-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=benh@kernel.crashing.org \
    --cc=davem@davemloft.net \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    --subject='Re: [PATCH 11/11] memblock: Move __alloc_memory_core_early() to nobootmem.c' \
    /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

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).