2008-07-15 Pavel Roskin <proski@gnu.org>

	* loader/ieee1275/multiboot2.c: Include grub/machine/loader.h.
	[__i386__] (grub_mb2_arch_boot): Avoid unnecessary cast.

diff --git a/ChangeLog b/ChangeLog
index 111179a7878c710fc4ee7ad4aeee2b4810ee96af..d304676e47f5e6d7ae4b70a91091dc1f7da6eaee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-15  Pavel Roskin  <proski@gnu.org>
+
+       * loader/ieee1275/multiboot2.c: Include grub/machine/loader.h.
+       [__i386__] (grub_mb2_arch_boot): Avoid unnecessary cast.
+
 2008-07-14  Pavel Roskin  <proski@gnu.org>
 
        * kern/env.c (grub_register_variable_hook): Don't copy empty

diff --git a/loader/ieee1275/multiboot2.c b/loader/ieee1275/multiboot2.c
index e3657fd484e2edf1d2621a9021a7880863c4ca12..c253fc938e787bbdee903a843c5b696ecb6c8039 100644 (file)
--- a/loader/ieee1275/multiboot2.c
+++ b/loader/ieee1275/multiboot2.c
@@ -26,6 +26,7 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/machine/kernel.h>
+#include <grub/machine/loader.h>
 
 typedef void (*kernel_entry_t) (unsigned long, void *, int (void *),
                                 unsigned long, unsigned long);
@@ -114,11 +115,11 @@ grub_mb2_arch_unload (struct multiboot_tag_header *tags)
 void
 grub_mb2_arch_boot (grub_addr_t entry_addr, void *tags)
 {
-  kernel_entry_t entry = (kernel_entry_t) entry_addr;
 #if defined(__powerpc__)
+  kernel_entry_t entry = (kernel_entry_t) entry_addr;
   entry (MULTIBOOT2_BOOTLOADER_MAGIC, tags, grub_ieee1275_entry_fn, 0, 0);
 #elif defined(__i386__)
-  grub_multiboot2_real_boot (entry, tags);
+  grub_multiboot2_real_boot (entry_addr, tags);
 #else
 #error
 #endif