The patch titled
Move three functions that are only needed for CONFIG_MEMORY_HOTPLUG
has been removed from the -mm tree. Its filename was
move-three-functions-that-are-only-needed-for.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Move three functions that are only needed for CONFIG_MEMORY_HOTPLUG
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
into the appropriate #ifdef.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Cc: Andy Whitcroft <apw@xxxxxxxxxxxx>
Cc: Badari Pulavarty <pbadari@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/sparse.c | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff -puN mm/sparse.c~move-three-functions-that-are-only-needed-for mm/sparse.c
--- a/mm/sparse.c~move-three-functions-that-are-only-needed-for
+++ a/mm/sparse.c
@@ -240,6 +240,27 @@ static struct page __init *sparse_early_
return NULL;
}
+/*
+ * Allocate the accumulated non-linear sections, allocate a mem_map
+ * for each and record the physical to section mapping.
+ */
+void __init sparse_init(void)
+{
+ unsigned long pnum;
+ struct page *map;
+
+ for (pnum = 0; pnum < NR_MEM_SECTIONS; pnum++) {
+ if (!valid_section_nr(pnum))
+ continue;
+
+ map = sparse_early_mem_map_alloc(pnum);
+ if (!map)
+ continue;
+ sparse_init_one_section(__nr_to_section(pnum), pnum, map);
+ }
+}
+
+#ifdef CONFIG_MEMORY_HOTPLUG
static struct page *__kmalloc_section_memmap(unsigned long nr_pages)
{
struct page *page, *ret;
@@ -280,27 +301,6 @@ static void __kfree_section_memmap(struc
}
/*
- * Allocate the accumulated non-linear sections, allocate a mem_map
- * for each and record the physical to section mapping.
- */
-void __init sparse_init(void)
-{
- unsigned long pnum;
- struct page *map;
-
- for (pnum = 0; pnum < NR_MEM_SECTIONS; pnum++) {
- if (!valid_section_nr(pnum))
- continue;
-
- map = sparse_early_mem_map_alloc(pnum);
- if (!map)
- continue;
- sparse_init_one_section(__nr_to_section(pnum), pnum, map);
- }
-}
-
-#ifdef CONFIG_MEMORY_HOTPLUG
-/*
* returns the number of sections whose mem_maps were properly
* set. If this is <=0, then that means that the passed-in
* map was not consumed and must be freed.
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
origin.patch
viotape-use-designated-initializers-for-fops-member.patch
git-kbuild.patch
introduce-config_virt_to_bus.patch
remove-apparently-useless-commented-apm_get_battery_status.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
