[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2314] 2009-06-11 Pavel Roskin <address@hidden>
From: |
Pavel Roskin |
Subject: |
[2314] 2009-06-11 Pavel Roskin <address@hidden> |
Date: |
Thu, 11 Jun 2009 21:48:48 +0000 |
Revision: 2314
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2314
Author: proski
Date: 2009-06-11 21:48:48 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
2009-06-11 Pavel Roskin <address@hidden>
* loader/i386/bsd.c (grub_freebsd_boot): Rename `entry' to
`entry_lo' to fix variable shadowing.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/loader/i386/bsd.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-06-11 21:39:03 UTC (rev 2313)
+++ trunk/grub2/ChangeLog 2009-06-11 21:48:48 UTC (rev 2314)
@@ -1,3 +1,8 @@
+2009-06-11 Pavel Roskin <address@hidden>
+
+ * loader/i386/bsd.c (grub_freebsd_boot): Rename `entry' to
+ `entry_lo' to fix variable shadowing.
+
2009-06-11 Christian Franke <address@hidden>
* kern/misc.c (__enable_execute_stack): Add missing return type
Modified: trunk/grub2/loader/i386/bsd.c
===================================================================
--- trunk/grub2/loader/i386/bsd.c 2009-06-11 21:39:03 UTC (rev 2313)
+++ trunk/grub2/loader/i386/bsd.c 2009-06-11 21:48:48 UTC (rev 2314)
@@ -485,7 +485,7 @@
{
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 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2314] 2009-06-11 Pavel Roskin <address@hidden>,
Pavel Roskin <=