merge mainline into rescue-efi
This commit is contained in:
commit
918405fd8c
93 changed files with 2110 additions and 1525 deletions
|
@ -118,7 +118,9 @@ grub_machine_init (void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_QEMU)
|
||||
grub_machine_mmap_init ();
|
||||
#endif
|
||||
grub_machine_mmap_iterate (heap_init);
|
||||
|
||||
grub_tsc_init ();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue