From: Ingo Molnar <mingo@elte.hu>
To: Russ Anderson <rja@sgi.com>
Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de,
"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: [patch] x86: Trivial printk fix in efi.c
Date: Fri, 3 Oct 2008 10:19:58 +0200 [thread overview]
Message-ID: <20081003081958.GE32195@elte.hu> (raw)
In-Reply-To: <20081002223206.GA122667@sgi.com>
* Russ Anderson <rja@sgi.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@sgi.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@sgi.com>
Cc: Russ Anderson <rja@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.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();
prev parent reply other threads:[~2008-10-03 8:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-02 22:32 [patch] x86: Trivial printk fix in efi.c Russ Anderson
2008-10-03 8:19 ` Ingo Molnar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081003081958.GE32195@elte.hu \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rja@sgi.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox