2009-06-11 Pavel Roskin <proski@gnu.org>

	* loader/i386/bsd.c (grub_freebsd_boot): Rename `entry' to
	`entry_lo' to fix variable shadowing.

diff --git a/ChangeLog b/ChangeLog
index 5863073b7f940c61f049ca731d01e9f63dde06c1..5c2378dd7d8ad11ee47d680830846bcac2382da8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-11  Pavel Roskin  <proski@gnu.org>
+
+       * loader/i386/bsd.c (grub_freebsd_boot): Rename `entry' to
+       `entry_lo' to fix variable shadowing.
+
 2009-06-11  Christian Franke  <franke@computer.org>
 
        * kern/misc.c (__enable_execute_stack): Add missing return type

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index c6a97724df13f3b7301a3656c56b9181524b31dd..6214b001cb17f00db4c0999a7d03c22f42e0f7d3 100644 (file)
--- 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