diff --git a/[refs] b/[refs] index 4eea968f1410..812767b1eb2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 057647fc47b3a5fbcfa997041db3f483d506603c +refs/heads/master: 0c6cb974636dd29681b03f8eb0ae227decab01fb diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index ecf853b5e30e..b55bb358b832 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -2261,7 +2261,7 @@ unsigned long __init __absent_pages_in_range(int nid, /* Account for ranges past physical memory on this node */ if (range_end_pfn > prev_end_pfn) - hole_pages = range_end_pfn - + hole_pages += range_end_pfn - max(range_start_pfn, prev_end_pfn); return hole_pages;