The patch titled
Subject: mm-section-numbers-use-the-type-unsigned-long-v3
has been removed from the -mm tree. Its filename was
mm-section-numbers-use-the-type-unsigned-long-v3.patch
This patch was dropped because it was folded into mm-section-numbers-use-the-type-unsigned-long.patch
------------------------------------------------------
From: David Hildenbrand <david@xxxxxxxxxx>
Subject: mm-section-numbers-use-the-type-unsigned-long-v3
Link: http://lkml.kernel.org/r/20190620183139.4352-2-david@xxxxxxxxxx
Signed-off-by: David Hildenbrand <david@xxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Wei Yang <richard.weiyang@xxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Arun KS <arunks@xxxxxxxxxxxxxx>
Cc: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
Cc: Oscar Salvador <osalvador@xxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Cc: Baoquan He <bhe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/memory.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
--- a/drivers/base/memory.c~mm-section-numbers-use-the-type-unsigned-long-v3
+++ a/drivers/base/memory.c
@@ -131,17 +131,17 @@ static ssize_t phys_index_show(struct de
static ssize_t removable_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
- unsigned long nr, pfn;
- int ret = 1;
struct memory_block *mem = to_memory_block(dev);
+ unsigned long pfn;
+ int ret = 1, i;
if (mem->state != MEM_ONLINE)
goto out;
- for (nr = 0; nr < sections_per_block; nr++) {
- if (!present_section_nr(mem->start_section_nr + nr))
+ for (i = 0; i < sections_per_block; i++) {
+ if (!present_section_nr(mem->start_section_nr + i))
continue;
- pfn = section_nr_to_pfn(mem->start_section_nr + nr);
+ pfn = section_nr_to_pfn(mem->start_section_nr + i);
ret &= is_mem_section_removable(pfn, PAGES_PER_SECTION);
}
@@ -697,8 +697,7 @@ static int add_memory_block(unsigned lon
struct memory_block *mem;
unsigned long nr;
- for (nr = base_section_nr;
- nr < base_section_nr + sections_per_block;
+ for (nr = base_section_nr; nr < base_section_nr + sections_per_block;
nr++)
if (present_section_nr(nr))
section_count++;
@@ -823,10 +822,9 @@ static const struct attribute_group *mem
*/
int __init memory_dev_init(void)
{
- unsigned long nr;
int ret;
int err;
- unsigned long block_sz;
+ unsigned long block_sz, nr;
ret = subsys_system_register(&memory_subsys, memory_root_attr_groups);
if (ret)
@@ -841,7 +839,7 @@ int __init memory_dev_init(void)
*/
mutex_lock(&mem_sysfs_mutex);
for (nr = 0; nr <= __highest_present_section_nr;
- nr += sections_per_block) {
+ nr += sections_per_block) {
err = add_memory_block(nr);
if (!ret)
ret = err;
_
Patches currently in -mm which might be from david@xxxxxxxxxx are
mm-memory_hotplug-simplify-and-fix-check_hotplug_memory_range.patch
s390x-mm-fail-when-an-altmap-is-used-for-arch_add_memory.patch
s390x-mm-implement-arch_remove_memory.patch
arm64-mm-add-temporary-arch_remove_memory-implementation.patch
drivers-base-memory-pass-a-block_id-to-init_memory_block.patch
mm-memory_hotplug-allow-arch_remove_pages-without-config_memory_hotremove.patch
mm-memory_hotplug-create-memory-block-devices-after-arch_add_memory.patch
mm-memory_hotplug-drop-mhp_memblock_api.patch
mm-memory_hotplug-remove-memory-block-devices-before-arch_remove_memory.patch
mm-memory_hotplug-make-unregister_memory_block_under_nodes-never-fail.patch
mm-memory_hotplug-remove-zone-parameter-from-sparse_remove_one_section.patch
mm-section-numbers-use-the-type-unsigned-long.patch
drivers-base-memory-use-unsigned-long-for-block-ids.patch
mm-make-register_mem_sect_under_node-static.patch
mm-memory_hotplug-rename-walk_memory_range-and-pass-startsize-instead-of-pfns.patch
mm-memory_hotplug-move-and-simplify-walk_memory_blocks.patch
drivers-base-memoryc-get-rid-of-find_memory_block_hinted.patch
drivers-base-memoryc-get-rid-of-find_memory_block_hinted-v3.patch
drivers-base-memoryc-get-rid-of-find_memory_block_hinted-v3-fix.patch
