Fix FTBFS on mips and ppc

diff --git a/grub-core/lib/mips/relocator.c b/grub-core/lib/mips/relocator.c
index 537b0af2ca3b548b87a56aa9f2f9e230a836831a..9d5f49cb93a7fc471f33654e2fccbd08895b67aa 100644 (file)
--- a/grub-core/lib/mips/relocator.c
+++ b/grub-core/lib/mips/relocator.c
@@ -124,7 +124,7 @@ grub_relocator32_boot (struct grub_relocator *rel,
                                          (0xffffffff - stateset_size)
                                          + 1, stateset_size,
                                          sizeof (grub_uint32_t),
-                                         GRUB_RELOCATOR_PREFERENCE_NONE);
+                                         GRUB_RELOCATOR_PREFERENCE_NONE, 0);
   if (err)
     return err;
 

diff --git a/grub-core/lib/powerpc/relocator.c b/grub-core/lib/powerpc/relocator.c
index 85dfbeaf31e4823c16537abd1a0f222e5f595e83..bdf2b111be78cff513e3b02b1b3e3b98edb6ad30 100644 (file)
--- a/grub-core/lib/powerpc/relocator.c
+++ b/grub-core/lib/powerpc/relocator.c
@@ -119,7 +119,7 @@ grub_relocator32_boot (struct grub_relocator *rel,
                                          (0xffffffff - stateset_size)
                                          + 1, stateset_size,
                                          sizeof (grub_uint32_t),
-                                         GRUB_RELOCATOR_PREFERENCE_NONE);
+                                         GRUB_RELOCATOR_PREFERENCE_NONE, 0);
   if (err)
     return err;
 

diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
index aa4a39ebcf2b967aa5e6056f1d879aca8d6a0c52..4024902c632586ba374de82e23fc668ecb3e84dd 100644 (file)
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -1409,6 +1409,9 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
 
 #ifdef GRUB_MACHINE_EFI
     grub_efi_mmap_iterate (hook, avoid_efi_boot_services);
+#elif defined (__powerpc__)
+    (void) avoid_efi_boot_services;
+    grub_machine_mmap_iterate (hook);
 #else
     (void) avoid_efi_boot_services;
     grub_mmap_iterate (hook);

diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
index eddfb293c053c6a743b89a935271a5446f480eac..2b7df0a78b80368950ae5e1dbf11d6b65ea7bb85 100644 (file)
--- a/grub-core/loader/mips/linux.c
+++ b/grub-core/loader/mips/linux.c
@@ -479,7 +479,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
                                            + linux_size + 0x10000,
                                            (0x10000000 - size),
                                            size, 0x10000,
-                                           GRUB_RELOCATOR_PREFERENCE_NONE);
+                                           GRUB_RELOCATOR_PREFERENCE_NONE, 0);
 
     if (err)
       goto fail;

diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
index dd5057241a0e1145ab9d9c9356ac9551deb51dae..fcdf5ffeda20c80a55cb3de005d93ffa8bf4a1e7 100644 (file)
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -134,7 +134,11 @@ grub_multiboot_boot (void)
     return err;
 #endif
 
+#if defined (__i386__) || defined (__x86_64__)
   grub_relocator32_boot (grub_multiboot_relocator, state, 0);
+#else
+  grub_relocator32_boot (grub_multiboot_relocator, state);
+#endif
 
   /* Not reached.  */
   return GRUB_ERR_NONE;