Skip to content

Commit c87f944

Browse files
committed
x86/boot/e820: Make the field separator space character part of e820_print_type()
We are going to add more columns to the E820 table printout, so make e820_print_type()'s field separator (space character) part of the function itself. 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-7-mingo@kernel.org
1 parent 4d8e5a6 commit c87f944

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

arch/x86/kernel/e820.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,15 @@ void __init e820__range_add(u64 start, u64 size, enum e820_type type)
188188
static void __init e820_print_type(enum e820_type type)
189189
{
190190
switch (type) {
191-
case E820_TYPE_RAM: pr_cont("usable"); break;
192-
case E820_TYPE_RESERVED: pr_cont("reserved"); break;
193-
case E820_TYPE_SOFT_RESERVED: pr_cont("soft reserved"); break;
194-
case E820_TYPE_ACPI: pr_cont("ACPI data"); break;
195-
case E820_TYPE_NVS: pr_cont("ACPI NVS"); break;
196-
case E820_TYPE_UNUSABLE: pr_cont("unusable"); break;
191+
case E820_TYPE_RAM: pr_cont(" usable"); break;
192+
case E820_TYPE_RESERVED: pr_cont(" reserved"); break;
193+
case E820_TYPE_SOFT_RESERVED: pr_cont(" soft reserved"); break;
194+
case E820_TYPE_ACPI: pr_cont(" ACPI data"); break;
195+
case E820_TYPE_NVS: pr_cont(" ACPI NVS"); break;
196+
case E820_TYPE_UNUSABLE: pr_cont(" unusable"); break;
197197
case E820_TYPE_PMEM: /* Fall through: */
198-
case E820_TYPE_PRAM: pr_cont("persistent (type %u)", type); break;
199-
default: pr_cont("type %u", type); break;
198+
case E820_TYPE_PRAM: pr_cont(" persistent (type %u)", type); break;
199+
default: pr_cont(" type %u", type); break;
200200
}
201201
}
202202

@@ -492,9 +492,9 @@ __e820__range_update(struct e820_table *table, u64 start, u64 size, enum e820_ty
492492
size = ULLONG_MAX - start;
493493

494494
end = start + size;
495-
printk(KERN_DEBUG "e820: update [mem %#010Lx-%#010Lx] ", start, end - 1);
495+
printk(KERN_DEBUG "e820: update [mem %#010Lx-%#010Lx]", start, end - 1);
496496
e820_print_type(old_type);
497-
pr_cont(" ==> ");
497+
pr_cont(" ==>");
498498
e820_print_type(new_type);
499499
pr_cont("\n");
500500

@@ -569,7 +569,7 @@ u64 __init e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool
569569
size = ULLONG_MAX - start;
570570

571571
end = start + size;
572-
printk(KERN_DEBUG "e820: remove [mem %#010Lx-%#010Lx] ", start, end - 1);
572+
printk(KERN_DEBUG "e820: remove [mem %#010Lx-%#010Lx]", start, end - 1);
573573
if (check_type)
574574
e820_print_type(old_type);
575575
pr_cont("\n");

0 commit comments

Comments
 (0)