diff options
| author | Kazuhisa Ichikawa <ki@epsilou.com> | 2010-01-15 17:01:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-16 12:15:38 -0800 |
| commit | d2dbe08ddceb4ba2b274abb84326d7e69d454e5c (patch) | |
| tree | 7b363c03dc6441b3fe6ebdcacd892cbd09b04f29 /mm/page_alloc.c | |
| parent | 5dab600e6a153ceb64832f608069e6c08185411a (diff) | |
| download | linux-3.10-d2dbe08ddceb4ba2b274abb84326d7e69d454e5c.tar.gz linux-3.10-d2dbe08ddceb4ba2b274abb84326d7e69d454e5c.tar.bz2 linux-3.10-d2dbe08ddceb4ba2b274abb84326d7e69d454e5c.zip | |
mm/page_alloc: fix the range check for backward merging
The current check for 'backward merging' within add_active_range() does
not seem correct. start_pfn must be compared against
early_node_map[i].start_pfn (and NOT against .end_pfn) to find out whether
the new region is backward-mergeable with the existing range.
Signed-off-by: Kazuhisa Ichikawa <ki@epsilou.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 4e9f5cc5fb5..6ea4966a633 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3998,7 +3998,7 @@ void __init add_active_range(unsigned int nid, unsigned long start_pfn, } /* Merge backward if suitable */ - if (start_pfn < early_node_map[i].end_pfn && + if (start_pfn < early_node_map[i].start_pfn && end_pfn >= early_node_map[i].start_pfn) { early_node_map[i].start_pfn = start_pfn; return; |