github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 23:52:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

x86/boot/e820: Remove inverted boolean logic from the e820_nomerge() function name, rename it to e820_type_mergeable()

Browse Source 
It's a bad practice to put inverted logic into function names,
flip it back and rename it to e820_type_mergeable().

Add/update a few comments about this function while at it.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Nikolay Borisov <nik.borisov@suse.com>
Link: https://patch.msgid.link/20250515120549.2820541-2-mingo@kernel.org
This commit is contained in:
Ingo Molnar 2025-05-15 14:05:17 +02:00
parent adbf61cc47
commit db0d69c570
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/kernel/e820.c
View File

@ -305,18 +305,22 @@ static int __init cpcompare(const void *a, const void *b)
return (ap->addr != ap->entry->addr) - (bp->addr != bp->entry->addr);
}
static bool e820_nomerge(enum e820_type type)
/*
* Can two consecutive E820 entries of this same E820 type be merged?
*/
static bool e820_type_mergeable(enum e820_type type)
{
/*
* These types may indicate distinct platform ranges aligned to
* numa node, protection domain, performance domain, or other
* NUMA node, protection domain, performance domain, or other
* boundaries. Do not merge them.
*/
if (type == E820_TYPE_PRAM)
return true;
return false;
if (type == E820_TYPE_SOFT_RESERVED)
return true;
return false;
return false;
return true;
}
int __init e820__update_table(struct e820_table *table)
@ -394,7 +398,7 @@ int __init e820__update_table(struct e820_table *table)
}
/* Continue building up new map based on this information: */
if (current_type != last_type || e820_nomerge(current_type)) {
if (current_type != last_type || !e820_type_mergeable(current_type)) {
if (last_type) {
new_entries[new_nr_entries].size = change_point[chg_idx]->addr - last_addr;
/* Move forward only if the new size was non-zero: */