mm: section numbers use the type "unsigned long"

Patch series "mm: Further memory block device cleanups", v1.

Some further cleanups around memory block devices.  Especially, clean up
and simplify walk_memory_range().  Including some other minor cleanups.

This patch (of 6):

We are using a mixture of "int" and "unsigned long".  Let's make this
consistent by using "unsigned long" everywhere.  We'll do the same with
memory block ids next.

While at it, turn the "unsigned long i" in removable_show() into an int
- sections_per_block is an int.

[akpm@linux-foundation.org: s/unsigned long i/unsigned long nr/]
[david@redhat.com: v3]
Link: http://lkml.kernel.org/r/20190620183139.4352-2-david@redhat.com
Link: http://lkml.kernel.org/r/20190614100114.311-2-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Arun KS <arunks@codeaurora.org>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Baoquan He <bhe@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 826dd76f662e53b60fe63a705995c87b3b5208dc..5947b5a5686dd341e086e1ad84a7554ae70aa787 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -34,7 +34,7 @@ static DEFINE_MUTEX(mem_sysfs_mutex);
 
 static int sections_per_block;
 
 
 static int sections_per_block;
 

-static inline int base_memory_block_id(int section_nr)
+static inline int base_memory_block_id(unsigned long section_nr)

 {
        return section_nr / sections_per_block;
 }
 {
        return section_nr / sections_per_block;
 }


@@ -131,9 +131,9 @@ static ssize_t phys_index_show(struct device *dev,
 static ssize_t removable_show(struct device *dev, struct device_attribute *attr,
                              char *buf)
 {
 static ssize_t removable_show(struct device *dev, struct device_attribute *attr,
                              char *buf)
 {

-       unsigned long i, pfn;
-       int ret = 1;

        struct memory_block *mem = to_memory_block(dev);
        struct memory_block *mem = to_memory_block(dev);

+       unsigned long pfn;
+       int ret = 1, i;

 
        if (mem->state != MEM_ONLINE)
                goto out;
 
        if (mem->state != MEM_ONLINE)
                goto out;


@@ -691,15 +691,15 @@ static int init_memory_block(struct memory_block **memory, int block_id,
        return ret;
 }
 
        return ret;
 }
 

-static int add_memory_block(int base_section_nr)
+static int add_memory_block(unsigned long base_section_nr)

 {
 {

+       int ret, section_count = 0;

        struct memory_block *mem;
        struct memory_block *mem;

-       int i, ret, section_count = 0;
+       unsigned long nr;

 
 

-       for (i = base_section_nr;
-            i < base_section_nr + sections_per_block;
-            i++)
-               if (present_section_nr(i))
+       for (nr = base_section_nr; nr < base_section_nr + sections_per_block;
+            nr++)
+               if (present_section_nr(nr))

                        section_count++;
 
        if (section_count == 0)
                        section_count++;
 
        if (section_count == 0)


@@ -822,10 +822,9 @@ static const struct attribute_group *memory_root_attr_groups[] = {
  */
 int __init memory_dev_init(void)
 {
  */
 int __init memory_dev_init(void)
 {

-       unsigned int i;

        int ret;
        int err;
        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)
 
        ret = subsys_system_register(&memory_subsys, memory_root_attr_groups);
        if (ret)


@@ -839,9 +838,9 @@ int __init memory_dev_init(void)
         * during boot and have been initialized
         */
        mutex_lock(&mem_sysfs_mutex);
         * during boot and have been initialized
         */
        mutex_lock(&mem_sysfs_mutex);

-       for (i = 0; i <= __highest_present_section_nr;
-               i += sections_per_block) {
-               err = add_memory_block(i);
+       for (nr = 0; nr <= __highest_present_section_nr;
+            nr += sections_per_block) {
+               err = add_memory_block(nr);

                if (!ret)
                        ret = err;
        }
                if (!ret)
                        ret = err;
        }

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 70394cabaf4e0fe6efc3c18701796bb04c71168b..298d1c3e4c2e23d63ffe65ec71bacceab7d5b5af 100644 (file)
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -1219,7 +1219,7 @@ static inline struct mem_section *__nr_to_section(unsigned long nr)
                return NULL;
        return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
 }
                return NULL;
        return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
 }

-extern int __section_nr(struct mem_section* ms);
+extern unsigned long __section_nr(struct mem_section *ms);

 extern unsigned long usemap_size(void);
 
 /*
 extern unsigned long usemap_size(void);
 
 /*


@@ -1291,7 +1291,7 @@ static inline struct mem_section *__pfn_to_section(unsigned long pfn)
        return __nr_to_section(pfn_to_section_nr(pfn));
 }
 
        return __nr_to_section(pfn_to_section_nr(pfn));
 }
 

-extern int __highest_present_section_nr;
+extern unsigned long __highest_present_section_nr;

 
 #ifndef CONFIG_HAVE_ARCH_PFN_VALID
 static inline int pfn_valid(unsigned long pfn)
 
 #ifndef CONFIG_HAVE_ARCH_PFN_VALID
 static inline int pfn_valid(unsigned long pfn)

diff --git a/mm/sparse.c b/mm/sparse.c
index fe44b2d3bd7e9f0a23110a230d8b4de32ea925cd..b29534cea8c023b54538429be087bef993c32ff9 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -102,7 +102,7 @@ static inline int sparse_index_init(unsigned long section_nr, int nid)
 #endif
 
 #ifdef CONFIG_SPARSEMEM_EXTREME
 #endif
 
 #ifdef CONFIG_SPARSEMEM_EXTREME

-int __section_nr(struct mem_section* ms)
+unsigned long __section_nr(struct mem_section *ms)

 {
        unsigned long root_nr;
        struct mem_section *root = NULL;
 {
        unsigned long root_nr;
        struct mem_section *root = NULL;


@@ -121,9 +121,9 @@ int __section_nr(struct mem_section* ms)
        return (root_nr * SECTIONS_PER_ROOT) + (ms - root);
 }
 #else
        return (root_nr * SECTIONS_PER_ROOT) + (ms - root);
 }
 #else

-int __section_nr(struct mem_section* ms)
+unsigned long __section_nr(struct mem_section *ms)

 {
 {

-       return (int)(ms - mem_section[0]);
+       return (unsigned long)(ms - mem_section[0]);

 }
 #endif
 
 }
 #endif
 


@@ -178,10 +178,10 @@ void __meminit mminit_validate_memmodel_limits(unsigned long *start_pfn,
  * Keeping track of this gives us an easy way to break out of
  * those loops early.
  */
  * Keeping track of this gives us an easy way to break out of
  * those loops early.
  */

-int __highest_present_section_nr;
+unsigned long __highest_present_section_nr;

 static void section_mark_present(struct mem_section *ms)
 {
 static void section_mark_present(struct mem_section *ms)
 {

-       int section_nr = __section_nr(ms);
+       unsigned long section_nr = __section_nr(ms);

 
        if (section_nr > __highest_present_section_nr)
                __highest_present_section_nr = section_nr;
 
        if (section_nr > __highest_present_section_nr)
                __highest_present_section_nr = section_nr;


@@ -189,7 +189,7 @@ static void section_mark_present(struct mem_section *ms)
        ms->section_mem_map |= SECTION_MARKED_PRESENT;
 }
 
        ms->section_mem_map |= SECTION_MARKED_PRESENT;
 }
 

-static inline int next_present_section_nr(int section_nr)
+static inline unsigned long next_present_section_nr(unsigned long section_nr)

 {
        do {
                section_nr++;
 {
        do {
                section_nr++;