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

Commit f705ac4b authored by Alexander Kuleshov's avatar Alexander Kuleshov Committed by Linus Torvalds
Browse files

mm/memblock.c: move memblock_{add,reserve}_region into memblock_{add,reserve} 



memblock_add_region() and memblock_reserve_region() do nothing specific
before the call of memblock_add_range(), only print debug output.

We can do the same in memblock_add() and memblock_reserve() since both
memblock_add_region() and memblock_reserve_region() are not used by
anybody outside of memblock.c and memblock_{add,reserve}() have the same
set of flags and nids.

Since memblock_add_region() and memblock_reserve_region() will be
inlined, there will not be functional changes, but will improve code
readability a little.

Signed-off-by: default avatarAlexander Kuleshov <kuleshovmail@gmail.com>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 495367c0

mm/memblock.c

+6 −22
Original line number Original line Diff line number Diff line
@@ -606,22 +606,14 @@ int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size, 
	return memblock_add_range(&memblock.memory, base, size, nid, 0);

	return memblock_add_range(&memblock.memory, base, size, nid, 0);

}

}





static int __init_memblock memblock_add_region(phys_addr_t base,

int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)

						phys_addr_t size,

						int nid,

						unsigned long flags)

{

{

	memblock_dbg("memblock_add: [%#016llx-%#016llx] flags %#02lx %pF\n",

	memblock_dbg("memblock_add: [%#016llx-%#016llx] flags %#02lx %pF\n",

		     (unsigned long long)base,

		     (unsigned long long)base,

		     (unsigned long long)base + size - 1,

		     (unsigned long long)base + size - 1,

		     flags, (void *)_RET_IP_);

		     0UL, (void *)_RET_IP_);



	return memblock_add_range(&memblock.memory, base, size, nid, flags);

}





int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)

	return memblock_add_range(&memblock.memory, base, size, MAX_NUMNODES, 0);

{

	return memblock_add_region(base, size, MAX_NUMNODES, 0);

}

}





/**

/**
@@ -732,22 +724,14 @@ int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size) 
	return memblock_remove_range(&memblock.reserved, base, size);

	return memblock_remove_range(&memblock.reserved, base, size);

}

}





static int __init_memblock memblock_reserve_region(phys_addr_t base,

int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)

						   phys_addr_t size,

						   int nid,

						   unsigned long flags)

{

{

	memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pF\n",

	memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pF\n",

		     (unsigned long long)base,

		     (unsigned long long)base,

		     (unsigned long long)base + size - 1,

		     (unsigned long long)base + size - 1,

		     flags, (void *)_RET_IP_);

		     0UL, (void *)_RET_IP_);



	return memblock_add_range(&memblock.reserved, base, size, nid, flags);

}





int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)

	return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0);

{

	return memblock_reserve_region(base, size, MAX_NUMNODES, 0);

}

}





/**

/**