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

Commit c33bc315 authored by Xishi Qiu's avatar Xishi Qiu Committed by Linus Torvalds
Browse files

mm: use zone_end_pfn() instead of zone_start_pfn+spanned_pages 



Use "zone_end_pfn()" instead of "zone->zone_start_pfn + zone->spanned_pages".
Simplify the code, no functional change.

[akpm@linux-foundation.org: fix build]
Signed-off-by: default avatarXishi Qiu <qiuxishi@huawei.com>
Cc: Cody P Schafer <cody@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 674470d9

kernel/power/snapshot.c

+6 −6
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int create_mem_extents(struct list_head *list, gfp_t gfp_mask) 
		struct mem_extent *ext, *cur, *aux;



		zone_start = zone->zone_start_pfn;

		zone_end = zone->zone_start_pfn + zone->spanned_pages;

		zone_end = zone_end_pfn(zone);



		list_for_each_entry(ext, list, hook)

			if (zone_start <= ext->end)
@@ -884,7 +884,7 @@ static unsigned int count_highmem_pages(void) 
			continue;



		mark_free_pages(zone);

		max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;

		max_zone_pfn = zone_end_pfn(zone);

		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)

			if (saveable_highmem_page(zone, pfn))

				n++;
@@ -948,7 +948,7 @@ static unsigned int count_data_pages(void) 
			continue;



		mark_free_pages(zone);

		max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;

		max_zone_pfn = zone_end_pfn(zone);

		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)

			if (saveable_page(zone, pfn))

				n++;
@@ -1041,7 +1041,7 @@ copy_data_pages(struct memory_bitmap *copy_bm, struct memory_bitmap *orig_bm) 
		unsigned long max_zone_pfn;



		mark_free_pages(zone);

		max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;

		max_zone_pfn = zone_end_pfn(zone);

		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)

			if (page_is_saveable(zone, pfn))

				memory_bm_set_bit(orig_bm, pfn);
@@ -1093,7 +1093,7 @@ void swsusp_free(void) 
	unsigned long pfn, max_zone_pfn;



	for_each_populated_zone(zone) {

		max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;

		max_zone_pfn = zone_end_pfn(zone);

		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)

			if (pfn_valid(pfn)) {

				struct page *page = pfn_to_page(pfn);
@@ -1755,7 +1755,7 @@ static int mark_unsafe_pages(struct memory_bitmap *bm) 


	/* Clear page flags */

	for_each_populated_zone(zone) {

		max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;

		max_zone_pfn = zone_end_pfn(zone);

		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)

			if (pfn_valid(pfn))

				swsusp_unset_page_free(pfn_to_page(pfn));

mm/memory_hotplug.c

+4 −3
Original line number Diff line number Diff line
@@ -229,7 +229,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;

	old_zone_end_pfn = zone_end_pfn(zone);

	if (!zone->spanned_pages || start_pfn < zone->zone_start_pfn)

		zone->zone_start_pfn = start_pfn;
@@ -515,7 +515,8 @@ static void shrink_zone_span(struct zone *zone, unsigned long start_pfn, 
			     unsigned long end_pfn)

{

	unsigned long zone_start_pfn = zone->zone_start_pfn;

	unsigned long zone_end_pfn = zone->zone_start_pfn + zone->spanned_pages;

	unsigned long z = zone_end_pfn(zone); /* zone_end_pfn namespace clash */

	unsigned long zone_end_pfn = z;

	unsigned long pfn;

	struct mem_section *ms;

	int nid = zone_to_nid(zone);