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

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

mm: use populated_zone() instead of if(zone->present_pages) 



Use "if (zone->present_pages)" instead of "if (zone->present_pages)".
Simplify the code, no functional change.

Signed-off-by: default avatarXishi Qiu <qiuxishi@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 83285c72

mm/page_alloc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -4266,7 +4266,7 @@ static __meminit void zone_pcp_init(struct zone *zone) 
	 */

	 */

	zone->pageset = &boot_pageset;

	zone->pageset = &boot_pageset;





	if (zone->present_pages)

	if (populated_zone(zone))

		printk(KERN_DEBUG "  %s zone: %lu pages, LIFO batch:%u\n",

		printk(KERN_DEBUG "  %s zone: %lu pages, LIFO batch:%u\n",

			zone->name, zone->present_pages,

			zone->name, zone->present_pages,

					 zone_batchsize(zone));

					 zone_batchsize(zone));
@@ -5160,7 +5160,7 @@ static void check_for_memory(pg_data_t *pgdat, int nid) 




	for (zone_type = 0; zone_type <= ZONE_MOVABLE - 1; zone_type++) {

	for (zone_type = 0; zone_type <= ZONE_MOVABLE - 1; zone_type++) {

		struct zone *zone = &pgdat->node_zones[zone_type];

		struct zone *zone = &pgdat->node_zones[zone_type];

		if (zone->present_pages) {

		if (populated_zone(zone)) {

			node_set_state(nid, N_HIGH_MEMORY);

			node_set_state(nid, N_HIGH_MEMORY);

			if (N_NORMAL_MEMORY != N_HIGH_MEMORY &&

			if (N_NORMAL_MEMORY != N_HIGH_MEMORY &&

			    zone_type <= ZONE_NORMAL)

			    zone_type <= ZONE_NORMAL)