]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/boot/e820: Simplify & clarify __e820__range_add() a bit
authorIngo Molnar <mingo@kernel.org>
Thu, 15 May 2025 12:05:39 +0000 (14:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 14 Dec 2025 08:19:41 +0000 (09:19 +0100)
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
arch/x86/kernel/e820.c

index f5828029829f9bab07ff89db69da87b953c9a3ba..4758099a96bc5a4a42753487ad1f7903c53bee8b 100644 (file)
@@ -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++;
 }