hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/page_alloc: remove unused parameter in init_currently_empty_zone() 

Commit a2f3aa0257 ("[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>
This commit is contained in:
Yaowei Bai 2015-11-05 18:47:06 -08:00 committed by Linus Torvalds
parent f2f81fb2b7
commit b171e40930
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/mmzone.h
View File

@ -823,8 +823,7 @@ enum memmap_context {
MEMMAP_HOTPLUG, MEMMAP_HOTPLUG,
}; };
extern int init_currently_empty_zone(struct zone *zone, unsigned long start_pfn, extern int init_currently_empty_zone(struct zone *zone, unsigned long start_pfn,
unsigned long size, unsigned long size);
enum memmap_context context);
extern void lruvec_init(struct lruvec *lruvec); extern void lruvec_init(struct lruvec *lruvec);

4
mm/memory_hotplug.c
View File

@ -339,8 +339,8 @@ static int __ref ensure_zone_is_initialized(struct zone *zone,
unsigned long start_pfn, unsigned long num_pages) unsigned long start_pfn, unsigned long num_pages)
{ {
if (!zone_is_initialized(zone)) if (!zone_is_initialized(zone))
return init_currently_empty_zone(zone, start_pfn, num_pages, return init_currently_empty_zone(zone, start_pfn, num_pages);
MEMMAP_HOTPLUG);
return 0; return 0;
} }

6
mm/page_alloc.c
View File

@ -4900,8 +4900,7 @@ static __meminit void zone_pcp_init(struct zone *zone)
int __meminit init_currently_empty_zone(struct zone *zone, int __meminit init_currently_empty_zone(struct zone *zone,
unsigned long zone_start_pfn, unsigned long zone_start_pfn,
unsigned long size, unsigned long size)
enum memmap_context context)
{ {
struct pglist_data *pgdat = zone->zone_pgdat; struct pglist_data *pgdat = zone->zone_pgdat;
int ret; int ret;
@ -5413,8 +5412,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
set_pageblock_order(); set_pageblock_order();
setup_usemap(pgdat, zone, zone_start_pfn, size); setup_usemap(pgdat, zone, zone_start_pfn, size);
ret = init_currently_empty_zone(zone, zone_start_pfn, ret = init_currently_empty_zone(zone, zone_start_pfn, size);
size, MEMMAP_EARLY);
BUG_ON(ret); BUG_ON(ret);
memmap_init(size, nid, j, zone_start_pfn); memmap_init(size, nid, j, zone_start_pfn);
zone_start_pfn += size; zone_start_pfn += size;