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

* grub-core/boot/i386/pc/diskboot.S (firstlist): Rename to ...

Browse source 
(LOCAL(firstlist)): ... this. Move it before the firstlist and not
	after. All users updated.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-29 15:26:42 +01:00
parent a121c9648e
commit fb88381212
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/boot/i386/pc/diskboot.S (firstlist): Rename to ...
(LOCAL(firstlist)): ... this. Move it before the firstlist and not
after. All users updated.
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
Use the common size routine in hostfs so we can read disks as well. Use the common size routine in hostfs so we can read disks as well.

6
grub-core/boot/i386/pc/diskboot.S
View file

@ -56,7 +56,7 @@ _start:
popw %si popw %si
/* this sets up for the first run through "bootloop" */ /* this sets up for the first run through "bootloop" */
movw $(firstlist - GRUB_BOOT_MACHINE_LIST_SIZE), %di movw $LOCAL(firstlist), %di
/* save the sector number of the second sector in %ebp */ /* save the sector number of the second sector in %ebp */
movl (%di), %ebp movl (%di), %ebp
@ -363,7 +363,7 @@ LOCAL(message):
.word 0 .word 0
. = _start + 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE . = _start + 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE
LOCAL(firstlist): /* this label has to be before the first list entry!!! */
/* fill the first data listing with the default */ /* fill the first data listing with the default */
blocklist_default_start: blocklist_default_start:
/* this is the sector start parameter, in logical sectors from /* this is the sector start parameter, in logical sectors from
@ -376,5 +376,3 @@ blocklist_default_len:
blocklist_default_seg: blocklist_default_seg:
/* this is the segment of the starting address to load the data into */ /* this is the segment of the starting address to load the data into */
.word (GRUB_BOOT_MACHINE_KERNEL_SEG + 0x20) .word (GRUB_BOOT_MACHINE_KERNEL_SEG + 0x20)
firstlist: /* this label has to be after the list data!!! */