summaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
authorYaowei Bai <bywxiaobai@163.com>2015-11-05 21:47:06 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-05 22:34:48 -0500
commitb171e4093017d4d6e411f5e97823e5e4a21266a2 (patch)
treea8579ea692239eb3058541654ad8145dc4d0e3e9 /mm/page_alloc.c
parentf2f81fb2b72b83b661b11da6f1b0bd3526706278 (diff)
mm/page_alloc: remove unused parameter in init_currently_empty_zone()
Commit a2f3aa025766 ("[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: Yaowei Bai <bywxiaobai@163.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 805bbad2e24e..c60605df9b48 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4900,8 +4900,7 @@ static __meminit void zone_pcp_init(struct zone *zone)
4900 4900
4901int __meminit init_currently_empty_zone(struct zone *zone, 4901int __meminit init_currently_empty_zone(struct zone *zone,
4902 unsigned long zone_start_pfn, 4902 unsigned long zone_start_pfn,
4903 unsigned long size, 4903 unsigned long size)
4904 enum memmap_context context)
4905{ 4904{
4906 struct pglist_data *pgdat = zone->zone_pgdat; 4905 struct pglist_data *pgdat = zone->zone_pgdat;
4907 int ret; 4906 int ret;
@@ -5413,8 +5412,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
5413 5412
5414 set_pageblock_order(); 5413 set_pageblock_order();
5415 setup_usemap(pgdat, zone, zone_start_pfn, size); 5414 setup_usemap(pgdat, zone, zone_start_pfn, size);
5416 ret = init_currently_empty_zone(zone, zone_start_pfn, 5415 ret = init_currently_empty_zone(zone, zone_start_pfn, size);
5417 size, MEMMAP_EARLY);
5418 BUG_ON(ret); 5416 BUG_ON(ret);
5419 memmap_init(size, nid, j, zone_start_pfn); 5417 memmap_init(size, nid, j, zone_start_pfn);
5420 zone_start_pfn += size; 5418 zone_start_pfn += size;