Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd7324ed authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm, compaction: fix wrong pfn handling in __reset_isolation_pfn()"

parents 49365121 2a239da9

mm/compaction.c

+4 −3
Original line number Diff line number Diff line
@@ -270,14 +270,15 @@ __reset_isolation_pfn(struct zone *zone, unsigned long pfn, bool check_source, 


	/* Ensure the start of the pageblock or zone is online and valid */

	block_pfn = pageblock_start_pfn(pfn);

	block_page = pfn_to_online_page(max(block_pfn, zone->zone_start_pfn));

	block_pfn = max(block_pfn, zone->zone_start_pfn);

	block_page = pfn_to_online_page(block_pfn);

	if (block_page) {

		page = block_page;

		pfn = block_pfn;

	}



	/* Ensure the end of the pageblock or zone is online and valid */

	block_pfn += pageblock_nr_pages;

	block_pfn = pageblock_end_pfn(pfn) - 1;

	block_pfn = min(block_pfn, zone_end_pfn(zone) - 1);

	end_page = pfn_to_online_page(block_pfn);

	if (!end_page)
@@ -303,7 +304,7 @@ __reset_isolation_pfn(struct zone *zone, unsigned long pfn, bool check_source, 


		page += (1 << PAGE_ALLOC_COSTLY_ORDER);

		pfn += (1 << PAGE_ALLOC_COSTLY_ORDER);

	} while (page < end_page);

	} while (page <= end_page);



	return false;

}