The patch titled
Subject: mm/memblock.c: rename local variable of memblock_type to `type'
has been removed from the -mm tree. Its filename was
mm-memblockc-name-the-local-variable-of-memblock_type-as-type.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Baoquan He <bhe@xxxxxxxxxx>
Subject: mm/memblock.c: rename local variable of memblock_type to `type'
A small cleanup. Seems in e3239ff9 ("memblock: Rename memblock_region to
memblock_type and memblock_property to memblock_region") this one was
missed.
Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memblock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN mm/memblock.c~mm-memblockc-name-the-local-variable-of-memblock_type-as-type mm/memblock.c
--- a/mm/memblock.c~mm-memblockc-name-the-local-variable-of-memblock_type-as-type
+++ a/mm/memblock.c
@@ -699,14 +699,14 @@ static int __init_memblock memblock_rese
int nid,
unsigned long flags)
{
- struct memblock_type *_rgn = &memblock.reserved;
+ 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(_rgn, base, size, nid, flags);
+ return memblock_add_range(type, base, size, nid, flags);
}
int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)
_
Patches currently in -mm which might be from bhe@xxxxxxxxxx are
origin.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
