- Use 'idx' index variable instead of a weird 'x'
- Make the error message E820-specific
- Group the code a bit better
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Andy Shevchenko <andy@kernel.org>
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
arch/x86/kernel/e820.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index ae05161896d4..6e626c4a3817 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -165,17 +165,18 @@ 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)
{
- int x = table->nr_entries;
+ int idx = table->nr_entries;
- if (x >= ARRAY_SIZE(table->entries)) {
- pr_err("too many entries; ignoring [mem %#010llx-%#010llx]\n",
- start, start + size - 1);
+ if (idx >= ARRAY_SIZE(table->entries)) {
+ pr_err("too many E820 table entries; ignoring [mem %#010llx-%#010llx]\n",
+ start, start + size-1);
return;
}
- table->entries[x].addr = start;
- table->entries[x].size = size;
- table->entries[x].type = type;
+ table->entries[idx].addr = start;
+ table->entries[idx].size = size;
+ table->entries[idx].type = type;
+
table->nr_entries++;
}
--
2.45.2