The following commit has been merged into the x86/boot branch of tip:
Commit-ID: 4a7a13e04c0528771e5006cd781934f7bc4f8fa0
Gitweb: https://git.kernel.org/tip/4a7a13e04c0528771e5006cd781934f7bc4f8fa0
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Thu, 15 May 2025 14:05:29 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sun, 14 Dec 2025 09:19:39 +01:00
x86/boot/e820: Improve e820_print_type() messages
For E820_TYPE_RESERVED, print:
'reserved' -> 'device reserved'
For E820_TYPE_PRAM and E820_TYPE_PMEM:
'persistent' -> 'persistent RAM'
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Andy Shevchenko <andy@kernel.org>
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Juergen Gross <jgross@suse.com>
Cc: "H . Peter Anvin" <hpa@zytor.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>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Link: https://patch.msgid.link/20250515120549.2820541-14-mingo@kernel.org
---
arch/x86/kernel/e820.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 0316a18..0c3f12f 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -188,15 +188,15 @@ void __init e820__range_add(u64 start, u64 size, enum e820_type type)
static void __init e820_print_type(enum e820_type type)
{
switch (type) {
- case E820_TYPE_RAM: pr_cont(" System RAM"); break;
- case E820_TYPE_RESERVED: pr_cont(" reserved"); break;
- case E820_TYPE_SOFT_RESERVED: pr_cont(" soft reserved"); break;
- case E820_TYPE_ACPI: pr_cont(" ACPI data"); break;
- case E820_TYPE_NVS: pr_cont(" ACPI NVS"); break;
- case E820_TYPE_UNUSABLE: pr_cont(" unusable"); break;
+ case E820_TYPE_RAM: pr_cont(" System RAM"); break;
+ case E820_TYPE_RESERVED: pr_cont(" device reserved"); break;
+ case E820_TYPE_SOFT_RESERVED: pr_cont(" soft reserved"); break;
+ case E820_TYPE_ACPI: pr_cont(" ACPI data"); break;
+ case E820_TYPE_NVS: pr_cont(" ACPI NVS"); break;
+ case E820_TYPE_UNUSABLE: pr_cont(" unusable"); break;
case E820_TYPE_PMEM: /* Fall through: */
- case E820_TYPE_PRAM: pr_cont(" persistent (type %u)", type); break;
- default: pr_cont(" type %u", type); break;
+ case E820_TYPE_PRAM: pr_cont(" persistent RAM (type %u)", type); break;
+ default: pr_cont(" type %u", type); break;
}
}