From 8f9c655b1e15b4fa7b17be1b6a3a17ca65dff32c Mon Sep 17 00:00:00 2001 From: proski Date: Tue, 15 Jul 2008 04:07:37 +0000 Subject: [PATCH] 2008-07-15 Pavel Roskin * loader/ieee1275/multiboot2.c: Include grub/machine/loader.h. [__i386__] (grub_mb2_arch_boot): Avoid unnecessary cast. git-svn-id: svn+ssh://svn.savannah.gnu.org/grub/trunk/grub2@1705 d0de0278-0dc1-4c01-8a07-af38b3205e46 --- ChangeLog | 5 +++++ loader/ieee1275/multiboot2.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 111179a7..d304676e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-07-15 Pavel Roskin + + * loader/ieee1275/multiboot2.c: Include grub/machine/loader.h. + [__i386__] (grub_mb2_arch_boot): Avoid unnecessary cast. + 2008-07-14 Pavel Roskin * kern/env.c (grub_register_variable_hook): Don't copy empty diff --git a/loader/ieee1275/multiboot2.c b/loader/ieee1275/multiboot2.c index e3657fd4..c253fc93 100644 --- a/loader/ieee1275/multiboot2.c +++ b/loader/ieee1275/multiboot2.c @@ -26,6 +26,7 @@ #include #include #include +#include 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 -- 2.11.4.GIT