diff --git a/[refs] b/[refs] index 3268955fd056..60b55d17e851 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dab600e6a153ceb64832f608069e6c08185411a +refs/heads/master: d2dbe08ddceb4ba2b274abb84326d7e69d454e5c diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 4e9f5cc5fb59..6ea4966a6334 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/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;