merge mainline into newreloc

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-05-01 15:10:44 +02:00
commit c6fb51295b
35 changed files with 414 additions and 394 deletions

View file

@ -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 ();