vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* loader/i386/bsd.c (grub_freebsd_boot): Rename `entry' to
	`entry_lo' to fix variable shadowing.
This commit is contained in:
proski 2009-06-11 21:48:48 +00:00
parent af1f4f55f8
commit 3a4575d4ea
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2009-06-11 Christian Franke <franke@computer.org>
* kern/misc.c (__enable_execute_stack): Add missing return type * kern/misc.c (__enable_execute_stack): Add missing return type

4
loader/i386/bsd.c
View file

@ -485,7 +485,7 @@ grub_freebsd_boot (void)
{ {
grub_uint32_t *gdt; grub_uint32_t *gdt;
grub_uint8_t *trampoline; grub_uint8_t *trampoline;
void (*launch_trampoline) (grub_addr_t entry, ...) void (*launch_trampoline) (grub_addr_t entry_lo, ...)
__attribute__ ((cdecl, regparm (0))); __attribute__ ((cdecl, regparm (0)));
grub_uint8_t *pagetable; grub_uint8_t *pagetable;
@ -512,7 +512,7 @@ grub_freebsd_boot (void)
trampoline = (grub_uint8_t *) (kern_end - 4096 + 24 trampoline = (grub_uint8_t *) (kern_end - 4096 + 24
+ sizeof (struct gdt_descriptor)); + sizeof (struct gdt_descriptor));
launch_trampoline = (void __attribute__ ((cdecl, regparm (0))) 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_gdt = (grub_uint32_t) gdtdesc;
grub_bsd64_trampoline_selfjump grub_bsd64_trampoline_selfjump
= (grub_uint32_t) (trampoline + 6 = (grub_uint32_t) (trampoline + 6