Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b171e409 authored by Yaowei Bai's avatar Yaowei Bai Committed by Linus Torvalds
Browse files

mm/page_alloc: remove unused parameter in init_currently_empty_zone() 



Commit a2f3aa02 ("[PATCH] Fix sparsemem on Cell") fixed an oops
experienced on the Cell architecture when init-time functions,
early_*(), are called at runtime by introducing an 'enum memmap_context'
parameter to memmap_init_zone() and init_currently_empty_zone().  This
parameter is intended to be used to tell whether the call of these two
functions is being made on behalf of a hotplug event, or happening at
boot-time.  However, init_currently_empty_zone() does not use this
parameter at all, so remove it.

Signed-off-by: default avatarYaowei Bai <bywxiaobai@163.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2f81fb2

include/linux/mmzone.h

+1 −2
Original line number Diff line number Diff line
@@ -823,8 +823,7 @@ enum memmap_context { 
	MEMMAP_HOTPLUG,

};

extern int init_currently_empty_zone(struct zone *zone, unsigned long start_pfn,

				     unsigned long size,

				     enum memmap_context context);

				     unsigned long size);



extern void lruvec_init(struct lruvec *lruvec);

mm/memory_hotplug.c

+2 −2
Original line number Diff line number Diff line
@@ -339,8 +339,8 @@ static int __ref ensure_zone_is_initialized(struct zone *zone, 
			unsigned long start_pfn, unsigned long num_pages)

{

	if (!zone_is_initialized(zone))

		return init_currently_empty_zone(zone, start_pfn, num_pages,

						 MEMMAP_HOTPLUG);

		return init_currently_empty_zone(zone, start_pfn, num_pages);



	return 0;

}

mm/page_alloc.c

+2 −4
Original line number Diff line number Diff line
@@ -4900,8 +4900,7 @@ static __meminit void zone_pcp_init(struct zone *zone) 


int __meminit init_currently_empty_zone(struct zone *zone,

					unsigned long zone_start_pfn,

					unsigned long size,

					enum memmap_context context)

					unsigned long size)

{

	struct pglist_data *pgdat = zone->zone_pgdat;

	int ret;
@@ -5413,8 +5412,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) 


		set_pageblock_order();

		setup_usemap(pgdat, zone, zone_start_pfn, size);

		ret = init_currently_empty_zone(zone, zone_start_pfn,

						size, MEMMAP_EARLY);

		ret = init_currently_empty_zone(zone, zone_start_pfn, size);

		BUG_ON(ret);

		memmap_init(size, nid, j, zone_start_pfn);

		zone_start_pfn += size;