Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 110379
b: refs/heads/master
c: 175e438
h: refs/heads/master
i:
  110377: db5928c
  110375: afefac8
v: v3
  • Loading branch information
Russ Anderson authored and Ingo Molnar committed Oct 3, 2008
1 parent 3251fc7 commit 083da1c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 153dab77e228931f3aff74f21b762927ac710ca7
refs/heads/master: 175e438f7a2de9d94110046be48697969569736a
6 changes: 4 additions & 2 deletions trunk/arch/x86/kernel/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit 083da1c

Please sign in to comment.