lkml.org 
[lkml]   [2008]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [patch] x86: Trivial printk fix in efi.c

* 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();


\
 
 \ /
  Last update: 2008-10-03 10:23    [W:0.034 / U:0.540 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site