vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix FTBFS on mips and ppc

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-03 20:53:54 +01:00
parent 1e95b56e59
commit 123f9c50eb
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/lib/mips/relocator.c
View file

@ -124,7 +124,7 @@ grub_relocator32_boot (struct grub_relocator *rel,
(0xffffffff - stateset_size) (0xffffffff - stateset_size)
+ 1, stateset_size, + 1, stateset_size,
sizeof (grub_uint32_t), sizeof (grub_uint32_t),
GRUB_RELOCATOR_PREFERENCE_NONE); GRUB_RELOCATOR_PREFERENCE_NONE, 0);
if (err) if (err)
return err; return err;

2
grub-core/lib/powerpc/relocator.c
View file

@ -119,7 +119,7 @@ grub_relocator32_boot (struct grub_relocator *rel,
(0xffffffff - stateset_size) (0xffffffff - stateset_size)
+ 1, stateset_size, + 1, stateset_size,
sizeof (grub_uint32_t), sizeof (grub_uint32_t),
GRUB_RELOCATOR_PREFERENCE_NONE); GRUB_RELOCATOR_PREFERENCE_NONE, 0);
if (err) if (err)
return err; return err;

3
grub-core/lib/relocator.c
View file

@ -1409,6 +1409,9 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
#ifdef GRUB_MACHINE_EFI #ifdef GRUB_MACHINE_EFI
grub_efi_mmap_iterate (hook, avoid_efi_boot_services); grub_efi_mmap_iterate (hook, avoid_efi_boot_services);
#elif defined (__powerpc__)
(void) avoid_efi_boot_services;
grub_machine_mmap_iterate (hook);
#else #else
(void) avoid_efi_boot_services; (void) avoid_efi_boot_services;
grub_mmap_iterate (hook); grub_mmap_iterate (hook);

2
grub-core/loader/mips/linux.c
View file

@ -479,7 +479,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ linux_size + 0x10000, + linux_size + 0x10000,
(0x10000000 - size), (0x10000000 - size),
size, 0x10000, size, 0x10000,
GRUB_RELOCATOR_PREFERENCE_NONE); GRUB_RELOCATOR_PREFERENCE_NONE, 0);
if (err) if (err)
goto fail; goto fail;

4
grub-core/loader/multiboot.c
View file

@ -134,7 +134,11 @@ grub_multiboot_boot (void)
return err; return err;
#endif #endif
#if defined (__i386__) || defined (__x86_64__)
grub_relocator32_boot (grub_multiboot_relocator, state, 0); grub_relocator32_boot (grub_multiboot_relocator, state, 0);
#else
grub_relocator32_boot (grub_multiboot_relocator, state);
#endif
/* Not reached. */ /* Not reached. */
return GRUB_ERR_NONE; return GRUB_ERR_NONE;