[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20081003081958.GE32195@elte.hu>
Date: Fri, 3 Oct 2008 10:19:58 +0200
From: Ingo Molnar <mingo@...e.hu>
To: Russ Anderson <rja@....com>
Cc: linux-kernel@...r.kernel.org, tglx@...utronix.de,
"H. Peter Anvin" <hpa@...or.com>
Subject: Re: [patch] x86: Trivial printk fix in efi.c
* Russ Anderson <rja@....com> wrote:
> [patch] x86: Trivial printk fix in efi.c
>
> The following line is lacking a space between "memdesc" and "doesn't".
>
> "Kernel-defined memdescdoesn't match the one from EFI!"
>
> Fixed the printk by adding a space.
> - printk(KERN_WARNING "Kernel-defined memdesc"
> + printk(KERN_WARNING "Kernel-defined memdesc "
> "doesn't match the one from EFI!\n");
the dangers of breaking a string in the middle.
applied your fix in the form below to tip/x86/cleanups - thanks Russ!
Ingo
------------------->
>From 175e438f7a2de9d94110046be48697969569736a Mon Sep 17 00:00:00 2001
From: Russ Anderson <rja@....com>
Date: Thu, 2 Oct 2008 17:32:06 -0500
Subject: [PATCH] x86: trivial printk fix in efi.c
[patch] x86: Trivial printk fix in efi.c
The following line is lacking a space between "memdesc" and "doesn't".
"Kernel-defined memdescdoesn't match the one from EFI!"
Fixed the printk by adding a space.
Signed-off-by: Russ Anderson <rja@....com>
Cc: Russ Anderson <rja@....com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/efi.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c
index 06cc8d4..945a31c 100644
--- a/arch/x86/kernel/efi.c
+++ b/arch/x86/kernel/efi.c
@@ -414,9 +414,11 @@ void __init efi_init(void)
if (memmap.map == NULL)
printk(KERN_ERR "Could not map the EFI memory map!\n");
memmap.map_end = memmap.map + (memmap.nr_map * memmap.desc_size);
+
if (memmap.desc_size != sizeof(efi_memory_desc_t))
- printk(KERN_WARNING "Kernel-defined memdesc"
- "doesn't match the one from EFI!\n");
+ printk(KERN_WARNING
+ "Kernel-defined memdesc doesn't match the one from EFI!\n");
+
if (add_efi_memmap)
do_add_efi_memmap();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists