Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm: use zone_is_empty() instead of if(zone->spanned_pages)

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

Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
Cc: Cody P Schafer <cody@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Xishi Qiu and committed by
Linus Torvalds
8080fc03 c33bc315

+4 -4
+3 -3
mm/memory_hotplug.c
··· 230 230 zone_span_writelock(zone); 231 231 232 232 old_zone_end_pfn = zone_end_pfn(zone); 233 - if (!zone->spanned_pages || start_pfn < zone->zone_start_pfn) 233 + if (zone_is_empty(zone) || start_pfn < zone->zone_start_pfn) 234 234 zone->zone_start_pfn = start_pfn; 235 235 236 236 zone->spanned_pages = max(old_zone_end_pfn, end_pfn) - ··· 305 305 goto out_fail; 306 306 307 307 /* use start_pfn for z1's start_pfn if z1 is empty */ 308 - if (z1->spanned_pages) 308 + if (!zone_is_empty(z1)) 309 309 z1_start_pfn = z1->zone_start_pfn; 310 310 else 311 311 z1_start_pfn = start_pfn; ··· 347 347 goto out_fail; 348 348 349 349 /* use end_pfn for z2's end_pfn if z2 is empty */ 350 - if (z2->spanned_pages) 350 + if (!zone_is_empty(z2)) 351 351 z2_end_pfn = zone_end_pfn(z2); 352 352 else 353 353 z2_end_pfn = end_pfn;
+1 -1
mm/page_alloc.c
··· 1306 1306 int order, t; 1307 1307 struct list_head *curr; 1308 1308 1309 - if (!zone->spanned_pages) 1309 + if (zone_is_empty(zone)) 1310 1310 return; 1311 1311 1312 1312 spin_lock_irqsave(&zone->lock, flags);