merge mainline into newreloc
This commit is contained in:
commit
c6fb51295b
35 changed files with 414 additions and 394 deletions
|
@ -102,7 +102,9 @@ grub_machine_init (void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef GRUB_MACHINE_MULTIBOOT
|
||||
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