From: proski Date: Thu, 11 Jun 2009 21:48:48 +0000 (+0000) Subject: 2009-06-11 Pavel Roskin X-Git-Tag: 1.98~809 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a4575d4ea56c41583216ed74ed698c708104853;p=thirdparty%2Fgrub.git 2009-06-11 Pavel Roskin * loader/i386/bsd.c (grub_freebsd_boot): Rename `entry' to `entry_lo' to fix variable shadowing. --- diff --git a/ChangeLog b/ChangeLog index 5863073b7..5c2378dd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-06-11 Pavel Roskin + + * loader/i386/bsd.c (grub_freebsd_boot): Rename `entry' to + `entry_lo' to fix variable shadowing. + 2009-06-11 Christian Franke * kern/misc.c (__enable_execute_stack): Add missing return type diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c index c6a97724d..6214b001c 100644 --- a/loader/i386/bsd.c +++ b/loader/i386/bsd.c @@ -485,7 +485,7 @@ grub_freebsd_boot (void) { grub_uint32_t *gdt; grub_uint8_t *trampoline; - void (*launch_trampoline) (grub_addr_t entry, ...) + void (*launch_trampoline) (grub_addr_t entry_lo, ...) __attribute__ ((cdecl, regparm (0))); grub_uint8_t *pagetable; @@ -512,7 +512,7 @@ grub_freebsd_boot (void) trampoline = (grub_uint8_t *) (kern_end - 4096 + 24 + sizeof (struct gdt_descriptor)); launch_trampoline = (void __attribute__ ((cdecl, regparm (0))) - (*) (grub_addr_t entry, ...)) trampoline; + (*) (grub_addr_t entry_lo, ...)) trampoline; grub_bsd64_trampoline_gdt = (grub_uint32_t) gdtdesc; grub_bsd64_trampoline_selfjump = (grub_uint32_t) (trampoline + 6