diff options
Diffstat (limited to 'arch/x86/kernel/efi.c')
| -rw-r--r-- | 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 06cc8d4254b1..945a31cdd81f 100644 --- a/arch/x86/kernel/efi.c +++ b/arch/x86/kernel/efi.c | |||
| @@ -414,9 +414,11 @@ void __init efi_init(void) | |||
| 414 | if (memmap.map == NULL) | 414 | if (memmap.map == NULL) | 
| 415 | printk(KERN_ERR "Could not map the EFI memory map!\n"); | 415 | printk(KERN_ERR "Could not map the EFI memory map!\n"); | 
| 416 | memmap.map_end = memmap.map + (memmap.nr_map * memmap.desc_size); | 416 | memmap.map_end = memmap.map + (memmap.nr_map * memmap.desc_size); | 
| 417 | |||
| 417 | if (memmap.desc_size != sizeof(efi_memory_desc_t)) | 418 | if (memmap.desc_size != sizeof(efi_memory_desc_t)) | 
| 418 | printk(KERN_WARNING "Kernel-defined memdesc" | 419 | printk(KERN_WARNING | 
| 419 | "doesn't match the one from EFI!\n"); | 420 | "Kernel-defined memdesc doesn't match the one from EFI!\n"); | 
| 421 | |||
| 420 | if (add_efi_memmap) | 422 | if (add_efi_memmap) | 
| 421 | do_add_efi_memmap(); | 423 | do_add_efi_memmap(); | 
| 422 | 424 | ||
