From 083da1cabc0a6ac36bc4ca59aa0f1a067929c0f1 Mon Sep 17 00:00:00 2001
From: Russ Anderson <rja@sgi.com>
Date: Thu, 2 Oct 2008 17:32:06 -0500
Subject: [PATCH] --- yaml --- r: 110379 b: refs/heads/master c:
 175e438f7a2de9d94110046be48697969569736a h: refs/heads/master i:   110377:
 db5928c68bd40d1602df1feb867a7d359b70cc12   110375:
 afefac8a86a287c25a0114297a472ba5e97e48f5 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/kernel/efi.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 49e5681c0f82..b42bef94fade 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 153dab77e228931f3aff74f21b762927ac710ca7
+refs/heads/master: 175e438f7a2de9d94110046be48697969569736a
diff --git a/trunk/arch/x86/kernel/efi.c b/trunk/arch/x86/kernel/efi.c
index 06cc8d4254b1..945a31cdd81f 100644
--- a/trunk/arch/x86/kernel/efi.c
+++ b/trunk/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();