summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2025-05-15 15:05:39 +0300
committerIngo Molnar <mingo@kernel.org>2025-12-14 11:19:41 +0300
commit7df2f811b275e6067f7e15a966a2b6ff22a4edfc (patch)
tree81c41cbc6f5b332d8fd6765976cc876a8ac772b6
parent95060e411ffd1be5db641d469b759912abad3332 (diff)
downloadlinux-7df2f811b275e6067f7e15a966a2b6ff22a4edfc.tar.xz
x86/boot/e820: Simplify & clarify __e820__range_add() a bit
Use 'entry_new' to make clear we are allocating a new entry. Change the table-full message to say that the table is full. Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: H . Peter Anvin <hpa@zytor.com> Cc: Andy Shevchenko <andy@kernel.org> Cc: Arnd Bergmann <arnd@kernel.org> Cc: David Woodhouse <dwmw@amazon.co.uk> Cc: Juergen Gross <jgross@suse.com> Cc: Kees Cook <keescook@chromium.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Rapoport <rppt@kernel.org> Cc: Paul Menzel <pmenzel@molgen.mpg.de> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://patch.msgid.link/20250515120549.2820541-24-mingo@kernel.org
-rw-r--r--arch/x86/kernel/e820.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index f5828029829f..4758099a96bc 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -165,16 +165,19 @@ int e820__get_entry_type(u64 start, u64 end)
static void __init __e820__range_add(struct e820_table *table, u64 start, u64 size, enum e820_type type)
{
u32 idx = table->nr_entries;
+ struct e820_entry *entry_new;
if (idx >= ARRAY_SIZE(table->entries)) {
- pr_err("too many E820 table entries; ignoring [mem %#010llx-%#010llx]\n",
+ pr_err("E820 table full; ignoring [mem %#010llx-%#010llx]\n",
start, start + size-1);
return;
}
- table->entries[idx].addr = start;
- table->entries[idx].size = size;
- table->entries[idx].type = type;
+ entry_new = table->entries + idx;
+
+ entry_new->addr = start;
+ entry_new->size = size;
+ entry_new->type = type;
table->nr_entries++;
}