mm/sparsemem: cleanup 'section number' data types
David points out that there is a mixture of 'int' and 'unsigned long' usage for section number data types. Update the memory hotplug path to use 'unsigned long' consistently for section numbers. [akpm@linux-foundation.org: fix printk format] Link: http://lkml.kernel.org/r/156107543656.1329419.11505835211949439815.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com> Reported-by: David Hildenbrand <david@redhat.com> Reviewed-by: David Hildenbrand <david@redhat.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: Jason Gunthorpe <jgg@mellanox.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a3619190d6
commit
9a84503042
|
@ -288,8 +288,8 @@ static int check_pfn_span(unsigned long pfn, unsigned long nr_pages,
|
|||
int __ref __add_pages(int nid, unsigned long pfn, unsigned long nr_pages,
|
||||
struct mhp_restrictions *restrictions)
|
||||
{
|
||||
unsigned long i;
|
||||
int start_sec, end_sec, err;
|
||||
int err;
|
||||
unsigned long nr, start_sec, end_sec;
|
||||
struct vmem_altmap *altmap = restrictions->altmap;
|
||||
|
||||
if (altmap) {
|
||||
|
@ -310,7 +310,7 @@ int __ref __add_pages(int nid, unsigned long pfn, unsigned long nr_pages,
|
|||
|
||||
start_sec = pfn_to_section_nr(pfn);
|
||||
end_sec = pfn_to_section_nr(pfn + nr_pages - 1);
|
||||
for (i = start_sec; i <= end_sec; i++) {
|
||||
for (nr = start_sec; nr <= end_sec; nr++) {
|
||||
unsigned long pfns;
|
||||
|
||||
pfns = min(nr_pages, PAGES_PER_SECTION
|
||||
|
@ -541,7 +541,7 @@ void __remove_pages(struct zone *zone, unsigned long pfn,
|
|||
unsigned long nr_pages, struct vmem_altmap *altmap)
|
||||
{
|
||||
unsigned long map_offset = 0;
|
||||
int i, start_sec, end_sec;
|
||||
unsigned long nr, start_sec, end_sec;
|
||||
|
||||
map_offset = vmem_altmap_offset(altmap);
|
||||
|
||||
|
@ -552,7 +552,7 @@ void __remove_pages(struct zone *zone, unsigned long pfn,
|
|||
|
||||
start_sec = pfn_to_section_nr(pfn);
|
||||
end_sec = pfn_to_section_nr(pfn + nr_pages - 1);
|
||||
for (i = start_sec; i <= end_sec; i++) {
|
||||
for (nr = start_sec; nr <= end_sec; nr++) {
|
||||
unsigned long pfns;
|
||||
|
||||
cond_resched();
|
||||
|
|
|
@ -229,21 +229,21 @@ void subsection_mask_set(unsigned long *map, unsigned long pfn,
|
|||
void __init subsection_map_init(unsigned long pfn, unsigned long nr_pages)
|
||||
{
|
||||
int end_sec = pfn_to_section_nr(pfn + nr_pages - 1);
|
||||
int i, start_sec = pfn_to_section_nr(pfn);
|
||||
unsigned long nr, start_sec = pfn_to_section_nr(pfn);
|
||||
|
||||
if (!nr_pages)
|
||||
return;
|
||||
|
||||
for (i = start_sec; i <= end_sec; i++) {
|
||||
for (nr = start_sec; nr <= end_sec; nr++) {
|
||||
struct mem_section *ms;
|
||||
unsigned long pfns;
|
||||
|
||||
pfns = min(nr_pages, PAGES_PER_SECTION
|
||||
- (pfn & ~PAGE_SECTION_MASK));
|
||||
ms = __nr_to_section(i);
|
||||
ms = __nr_to_section(nr);
|
||||
subsection_mask_set(ms->usage->subsection_map, pfn, pfns);
|
||||
|
||||
pr_debug("%s: sec: %d pfns: %ld set(%d, %d)\n", __func__, i,
|
||||
pr_debug("%s: sec: %lu pfns: %lu set(%d, %d)\n", __func__, nr,
|
||||
pfns, subsection_map_index(pfn),
|
||||
subsection_map_index(pfn + pfns - 1));
|
||||
|
||||
|
|
Loading…
Reference in a new issue