mm-simplify-parameter-of-setup_usemap.patch removed from -mm tree
The patch titled
Subject: mm: simplify parameter of setup_usemap()
has been removed from the -mm tree. Its filename was
mm-simplify-parameter-of-setup_usemap.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Baoquan He <[email protected]>
Subject: mm: simplify parameter of setup_usemap()
Parameter 'zone' has got needed information, let's remove other unnecessary parameters.
Signed-off-by Baoquan He <[email protected]>
Reviewed-by Mike Rapoport <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/page_alloc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
mm/page_alloc.c renamed from mm/page_alloc.c~mm-simplify-parameter-of-setup_usemap +7 -10
@@ -6765,25 +6765,22 @@ static unsigned long __init usemap_size( return usemapsize / 8; } -static void __ref setup_usemap (struct pglist_data *pgdat, -struct zone *zone, -unsigned long zone_start_pfn, -unsigned long zonesize) +static void __ref setup_usemap (struct zone *zone) { -unsigned long usemapsize =usemap_size (zone_start_pfn, zonesize); +unsigned long usemapsize =usemap_size (zone->zone_start_pfn, + zone->spanned_pages); zone->pageblock_flags =NULL ;if (usemapsize) { zone->pageblock_flags =memblock_alloc_node (usemapsize,SMP_CACHE_BYTES , - pgdat->node_id); +zone_to_nid (zone));if (!zone->pageblock_flags)panic ("Failed to allocate %ld bytes for zone %s pageblock flags on node %d\n" , - usemapsize, zone->name, pgdat->node_id); + usemapsize, zone->name,zone_to_nid (zone)); } }#else -static inline void setup_usemap (struct pglist_data *pgdat,struct zone *zone, -unsigned long zone_start_pfn,unsigned long zonesize) {} +static inline void setup_usemap (struct zone *zone) {}#endif /* CONFIG_SPARSEMEM */ #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
@@ -6978,7 +6975,7 @@ static void __init free_area_init_core(scontinue ;set_pageblock_order (); -setup_usemap (pgdat, zone, zone_start_pfn, size); +setup_usemap (zone);init_currently_empty_zone (zone, zone_start_pfn, size);memmap_init_zone (zone); }
_
Patches currently in -mm which might be from [email protected] are