diff options
| -rw-r--r-- | include/linux/memory_hotplug.h | 4 | ||||
| -rw-r--r-- | mm/memory_hotplug.c | 2 | ||||
| -rw-r--r-- | mm/sparse.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 9e4d9b9b93ea..8ed6e09a5c0c 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h | |||
| @@ -333,8 +333,8 @@ extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, | |||
| 333 | unsigned long nr_pages, struct vmem_altmap *altmap); | 333 | unsigned long nr_pages, struct vmem_altmap *altmap); |
| 334 | extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); | 334 | extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); |
| 335 | extern bool is_memblock_offlined(struct memory_block *mem); | 335 | extern bool is_memblock_offlined(struct memory_block *mem); |
| 336 | extern int sparse_add_one_section(struct pglist_data *pgdat, | 336 | extern int sparse_add_one_section(int nid, unsigned long start_pfn, |
| 337 | unsigned long start_pfn, struct vmem_altmap *altmap); | 337 | struct vmem_altmap *altmap); |
| 338 | extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms, | 338 | extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms, |
| 339 | unsigned long map_offset, struct vmem_altmap *altmap); | 339 | unsigned long map_offset, struct vmem_altmap *altmap); |
| 340 | extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, | 340 | extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, |
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 0718cf7427b2..5f15f9c04c4a 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
| @@ -253,7 +253,7 @@ static int __meminit __add_section(int nid, unsigned long phys_start_pfn, | |||
| 253 | if (pfn_valid(phys_start_pfn)) | 253 | if (pfn_valid(phys_start_pfn)) |
| 254 | return -EEXIST; | 254 | return -EEXIST; |
| 255 | 255 | ||
| 256 | ret = sparse_add_one_section(NODE_DATA(nid), phys_start_pfn, altmap); | 256 | ret = sparse_add_one_section(nid, phys_start_pfn, altmap); |
| 257 | if (ret < 0) | 257 | if (ret < 0) |
| 258 | return ret; | 258 | return ret; |
| 259 | 259 | ||
diff --git a/mm/sparse.c b/mm/sparse.c index 7323a03fbc39..7ea5dc6c6b19 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
| @@ -678,8 +678,8 @@ static void free_map_bootmem(struct page *memmap) | |||
| 678 | * set. If this is <=0, then that means that the passed-in | 678 | * set. If this is <=0, then that means that the passed-in |
| 679 | * map was not consumed and must be freed. | 679 | * map was not consumed and must be freed. |
| 680 | */ | 680 | */ |
| 681 | int __meminit sparse_add_one_section(struct pglist_data *pgdat, | 681 | int __meminit sparse_add_one_section(int nid, unsigned long start_pfn, |
| 682 | unsigned long start_pfn, struct vmem_altmap *altmap) | 682 | struct vmem_altmap *altmap) |
| 683 | { | 683 | { |
| 684 | unsigned long section_nr = pfn_to_section_nr(start_pfn); | 684 | unsigned long section_nr = pfn_to_section_nr(start_pfn); |
| 685 | struct mem_section *ms; | 685 | struct mem_section *ms; |
| @@ -691,11 +691,11 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat, | |||
| 691 | * no locking for this, because it does its own | 691 | * no locking for this, because it does its own |
| 692 | * plus, it does a kmalloc | 692 | * plus, it does a kmalloc |
| 693 | */ | 693 | */ |
| 694 | ret = sparse_index_init(section_nr, pgdat->node_id); | 694 | ret = sparse_index_init(section_nr, nid); |
| 695 | if (ret < 0 && ret != -EEXIST) | 695 | if (ret < 0 && ret != -EEXIST) |
| 696 | return ret; | 696 | return ret; |
| 697 | ret = 0; | 697 | ret = 0; |
| 698 | memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, altmap); | 698 | memmap = kmalloc_section_memmap(section_nr, nid, altmap); |
| 699 | if (!memmap) | 699 | if (!memmap) |
| 700 | return -ENOMEM; | 700 | return -ENOMEM; |
| 701 | usemap = __kmalloc_section_usemap(); | 701 | usemap = __kmalloc_section_usemap(); |
