From 7d4c95405e0a29c78f39776f3e352c15d5a5cb87 Mon Sep 17 00:00:00 2001 From: Tang Chen Date: Tue, 11 Dec 2012 16:01:07 -0800 Subject: [PATCH] --- yaml --- r: 338739 b: refs/heads/master c: 712cd386fdc983d318fecf302a2a9cb8e9de90c9 h: refs/heads/master i: 338737: 1ffa02226fd1b45813af3f242a827f676ba034fa 338735: fdc9d7271d0fb8dc14885f439fbb1b1bb9c073ae v: v3 --- [refs] | 2 +- trunk/mm/memory_hotplug.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 935c40b40664..7673c2344ca1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9d5ab2562eceeada5e4837a621b6260574dd11d +refs/heads/master: 712cd386fdc983d318fecf302a2a9cb8e9de90c9 diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c index 72195602ded5..571130ee66d7 100644 --- a/trunk/mm/memory_hotplug.c +++ b/trunk/mm/memory_hotplug.c @@ -205,7 +205,7 @@ static void grow_zone_span(struct zone *zone, unsigned long start_pfn, zone_span_writelock(zone); old_zone_end_pfn = zone->zone_start_pfn + zone->spanned_pages; - if (start_pfn < zone->zone_start_pfn) + if (!zone->spanned_pages || start_pfn < zone->zone_start_pfn) zone->zone_start_pfn = start_pfn; zone->spanned_pages = max(old_zone_end_pfn, end_pfn) - @@ -220,7 +220,7 @@ static void grow_pgdat_span(struct pglist_data *pgdat, unsigned long start_pfn, unsigned long old_pgdat_end_pfn = pgdat->node_start_pfn + pgdat->node_spanned_pages; - if (start_pfn < pgdat->node_start_pfn) + if (!pgdat->node_spanned_pages || start_pfn < pgdat->node_start_pfn) pgdat->node_start_pfn = start_pfn; pgdat->node_spanned_pages = max(old_pgdat_end_pfn, end_pfn) -