x86: Trivial printk fix in efi.c

PATCH In review Russ Anderson 2 participants 2 messages Oct 2, 2008 – Oct 3, 2008

Subsystems (2)

x86 EFI

lore

Share & tools

lore

Russ Anderson

author

2008-10-02 22:32 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 arch/x86/kernel/efi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/x86/kernel/efi.c +1 -1

Index: linux/arch/x86/kernel/efi.c
===================================================================
@@ -415,7 +415,7 @@ void __init efi_init(void)
 		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"
+		printk(KERN_WARNING "Kernel-defined memdesc "
 		       "doesn't match the one from EFI!\n");
 	if (add_efi_memmap)
 		do_add_efi_memmap();

Signature · 2 lines

Russ Anderson, OS RAS/Partitioning Project Lead  
SGI - Silicon Graphics Inc          [email protected]

Ingo Molnar

2008-10-03 08:20 UTC #1 lore raw

Review

Quoted 11 lines · Russ Anderson

[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.
(quoted diff) +1 -1
-		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

------------------->

Quoted 1 line

From 175e438f7a2de9d94110046be48697969569736a Mon Sep 17 00:00:00 2001

From: Russ Anderson <[email protected]>
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 <[email protected]>

Cc Russ Anderson <[email protected]>

Signed-off-by Ingo Molnar <[email protected]>

---
 arch/x86/kernel/efi.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

arch/x86/kernel/efi.c +4 -2

index 06cc8d4..945a31c 100644
@@ -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();