[1705] 2008-07-15 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 1705
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1705
Author:   proski
Date:     2008-07-15 04:07:37 +0000 (Tue, 15 Jul 2008)

Log Message:
-----------
2008-07-15  Pavel Roskin  <address@hidden>

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/loader/ieee1275/multiboot2.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-07-14 05:03:19 UTC (rev 1704)
+++ trunk/grub2/ChangeLog       2008-07-15 04:07:37 UTC (rev 1705)
@@ -1,3 +1,8 @@
+2008-07-15  Pavel Roskin  <address@hidden>
+
+       * loader/ieee1275/multiboot2.c: Include grub/machine/loader.h.
+       [__i386__] (grub_mb2_arch_boot): Avoid unnecessary cast.
+
 2008-07-14  Pavel Roskin  <address@hidden>
 
        * kern/env.c (grub_register_variable_hook): Don't copy empty

Modified: trunk/grub2/loader/ieee1275/multiboot2.c
===================================================================
--- trunk/grub2/loader/ieee1275/multiboot2.c    2008-07-14 05:03:19 UTC (rev 
1704)
+++ trunk/grub2/loader/ieee1275/multiboot2.c    2008-07-15 04:07:37 UTC (rev 
1705)
@@ -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 @@
 void
 grub_mb2_arch_boot (grub_addr_t entry_addr, void *tags)
 {
+#if defined(__powerpc__)
   kernel_entry_t entry = (kernel_entry_t) entry_addr;
-#if defined(__powerpc__)
   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