renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-20 00:26:39 +08:00
Code

memory hotplug: memmap_init_zone called twice

Browse Source 
__add_zone calls memmap_init_zone twice if memory gets attached to an empty
zone.  Once via init_currently_empty_zone and once explictly right after that
call.

Looks like this is currently not a bug, however the call is superfluous and
might lead to subtle bugs if memmap_init_zone gets changed.  So make sure it
is called only once.

Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Heiko Carstens 2008-05-14 16:05:40 -07:00 committed by Linus Torvalds
parent 3b7ec117bf
commit c3723ca387
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mm/memory_hotplug.c
View File

@ -167,13 +167,9 @@ static int __add_zone(struct zone *zone, unsigned long phys_start_pfn)
int zone_type; int zone_type;
zone_type = zone - pgdat->node_zones; zone_type = zone - pgdat->node_zones;
if (!zone->wait_table) { if (!zone->wait_table)
int ret = 0; return init_currently_empty_zone(zone, phys_start_pfn,
ret = init_currently_empty_zone(zone, phys_start_pfn,
nr_pages, MEMMAP_HOTPLUG); nr_pages, MEMMAP_HOTPLUG);
if (ret < 0)
return ret;
}
memmap_init_zone(nr_pages, nid, zone_type, memmap_init_zone(nr_pages, nid, zone_type,
phys_start_pfn, MEMMAP_HOTPLUG); phys_start_pfn, MEMMAP_HOTPLUG);
return 0; return 0;