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

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

mm/memblock.c: remove unnecessary memblock_type variable 



We define struct memblock_type *type in the memblock_add_region() and
memblock_reserve_region() functions only for passing it to the
memlock_add_range() and memblock_reserve_range() functions.  Let's
remove these variables and will pass a type directly.

Signed-off-by: default avatarAlexander Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a75e1f63

mm/memblock.c

+2 −6
Original line number Diff line number Diff line
@@ -612,14 +612,12 @@ static int __init_memblock memblock_add_region(phys_addr_t base, 
						int nid,

						unsigned long flags)

{

	struct memblock_type *type = &memblock.memory;



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

		     (unsigned long long)base,

		     (unsigned long long)base + size - 1,

		     flags, (void *)_RET_IP_);



	return memblock_add_range(type, base, size, nid, flags);

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

}



int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
@@ -740,14 +738,12 @@ static int __init_memblock memblock_reserve_region(phys_addr_t base, 
						   int nid,

						   unsigned long flags)

{

	struct memblock_type *type = &memblock.reserved;



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

		     (unsigned long long)base,

		     (unsigned long long)base + size - 1,

		     flags, (void *)_RET_IP_);



	return memblock_add_range(type, base, size, nid, flags);

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

}



int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)