Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eb31707 authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds
Browse files

memblock/nobootmem: remove unneeded code from alloc_bootmem_node_high() 



The bootmem wrapper with memblock supports top-down now, so we no longer
need this trick.

Signed-off-by: default avatarYinghai LU <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Olaf Hering <olaf@aepfle.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8bba154e

mm/nobootmem.c

+0 −23
Original line number Diff line number Diff line
@@ -307,30 +307,7 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, 
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