The patch titled
memblock/nobootmem: remove unneeded code from alloc_bootmem_node_high()
has been added to the -mm tree. Its filename is
memblock-nobootmem-remove-code-for-alloc_bootmem_node_high.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memblock/nobootmem: remove unneeded code from alloc_bootmem_node_high()
From: Yinghai Lu <yinghai@xxxxxxxxxx>
The bootmem wrapper with memblock supports top-down now, so we no longer
need this trick.
Signed-off-by: Yinghai LU <yinghai@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Olaf Hering <olaf@xxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/nobootmem.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff -puN mm/nobootmem.c~memblock-nobootmem-remove-code-for-alloc_bootmem_node_high mm/nobootmem.c
--- a/mm/nobootmem.c~memblock-nobootmem-remove-code-for-alloc_bootmem_node_high
+++ a/mm/nobootmem.c
@@ -307,30 +307,7 @@ void * __init __alloc_bootmem_node(pg_da
void * __init __alloc_bootmem_node_high(pg_data_t *pgdat, unsigned long size,
unsigned long align, unsigned long goal)
{
-#ifdef MAX_DMA32_PFN
- unsigned long end_pfn;
-
- if (WARN_ON_ONCE(slab_is_available()))
- return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);
-
- /* update goal according ...MAX_DMA32_PFN */
- end_pfn = pgdat->node_start_pfn + pgdat->node_spanned_pages;
-
- if (end_pfn > MAX_DMA32_PFN + (128 >> (20 - PAGE_SHIFT)) &&
- (goal >> PAGE_SHIFT) < MAX_DMA32_PFN) {
- void *ptr;
- unsigned long new_goal;
-
- new_goal = MAX_DMA32_PFN << PAGE_SHIFT;
- ptr = __alloc_memory_core_early(pgdat->node_id, size, align,
- new_goal, -1ULL);
- if (ptr)
- return ptr;
- }
-#endif
-
return __alloc_bootmem_node(pgdat, size, align, goal);
-
}
#ifdef CONFIG_SPARSEMEM
_
Patches currently in -mm which might be from yinghai@xxxxxxxxxx are
mm-use-alloc_bootmem_node_nopanic-on-really-needed-path.patch
mm-use-alloc_bootmem_node_nopanic-on-really-needed-path-fix.patch
linux-next.patch
memblock-nobootmem-allow-alloc_bootmem-to-take-0-as-low-limit.patch
memblock-nobootmem-remove-code-for-alloc_bootmem_node_high.patch
memblock-add-error-return-when-config_have_memblock-is-not-set.patch
memblock-add-input-size-checking-to-memblock_find_region.patch
memblock-add-input-size-checking-to-memblock_find_region-fix.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
