Skip to contentSkip to conversation

mm, meminit: Recalculate pcpu batch and high limits after init completes -fix

PATCH In review Mel Gorman 2 participants 2 messages Oct 23, 2019

Subsystems (2)
Memory management Page allocator
lore
Share & tools
lore

Mel Gorman

author
#0 lore raw

PATCH 1/1 mm, meminit: Recalculate pcpu batch and high limits after init completes -fix

LKP reported the following build problem from two hunks that did not survive the reshuffling of the series reordering.

ld: mm/page_alloc.o: in function `page_alloc_init_late':
mm/page_alloc.c:1956: undefined reference to `zone_pcp_update'

This is a fix for the mmotm patch mm-meminit-recalculate-pcpu-batch-and-high-limits-after-init-completes.patch

Reported-by kbuild test robot <[email protected]>
Signed-off-by Mel Gorman <[email protected]>
---
 mm/page_alloc.c | 2 --
 1 file changed, 2 deletions(-)
mm/page_alloc.c +0 -2
index f9488efff680..12f3ce09d33d 100644
@@ -8627,7 +8627,6 @@ void free_contig_range(unsigned long pfn, unsigned int nr_pages)
 	WARN(count != 0, "%d pages are still in use!\n", count);
 }
 
-#ifdef CONFIG_MEMORY_HOTPLUG
 /*
  * The zone indicated has a new number of managed_pages; batch sizes and percpu
  * page high values need to be recalulated.

@@ -8638,7 +8637,6 @@ void __meminit zone_pcp_update(struct zone *zone)
 	__zone_pcp_update(zone);
 	mutex_unlock(&pcp_batch_high_lock);
 }
-#endif
 
 void zone_pcp_reset(struct zone *zone)
 {
Acked-by on v1 1/1
#1 lore raw
Quoted 29 lines · Mel Gorman

LKP reported the following build problem from two hunks that did not survive the reshuffling of the series reordering.

ld: mm/page_alloc.o: in function `page_alloc_init_late':
mm/page_alloc.c:1956: undefined reference to `zone_pcp_update'

This is a fix for the mmotm patch mm-meminit-recalculate-pcpu-batch-and-high-limits-after-init-completes.patch

Reported-by kbuild test robot <[email protected]>
Signed-off-by Mel Gorman <[email protected]>
---
  mm/page_alloc.c | 2 --
  1 file changed, 2 deletions(-)
mm/page_alloc.c +0 -1
index f9488efff680..12f3ce09d33d 100644
@@ -8627,7 +8627,6 @@ void free_contig_range(unsigned long pfn, unsigned int nr_pages)
  	WARN(count != 0, "%d pages are still in use!\n", count);
  }
 
-#ifdef CONFIG_MEMORY_HOTPLUG
  /*
   * The zone indicated has a new number of managed_pages; batch sizes and percpu
   * page high values need to be recalulated.

mm/page_alloc.c void __meminit zone_pcp_update(struct zone *zone) · line 8642

Quoted 7 lines
mm/page_alloc.c +0 -1
@@ -8638,7 +8637,6 @@ void __meminit zone_pcp_update(struct zone *zone)
  	__zone_pcp_update(zone);
  	mutex_unlock(&pcp_batch_high_lock);
  }
-#endif
 
  void zone_pcp_reset(struct zone *zone)
  {
Acked-by David Hildenbrand <[email protected]>
Signature · 3 lines
Thanks,

David / dhildenb