← Back to branch summary

~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/fix-872244

« back to all changes in this revision

Viewing changes to grub-core/boot/i386/pc/lnxboot.S

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-17 23:59:10 UTC
  • mto: (17.3.55 sid)
  • mto: This revision was merged to the branch mainline in revision 122.
  • Revision ID: james.westby@ubuntu.com-20110517235910-ma8u889vyjdfro27
Tags: upstream-1.99
Import upstream version 1.99

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/boot/i386/pc/lnxboot.S
178
178
        pushw   %es
179
179
        popw    %ds
180
180
 
 
181
#if GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART + 4 < 0x200
181
182
        movl    $0x200, %ecx
182
183
        addl    %ecx, %esi
 
184
#else
 
185
        movl    $(GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART + 4), %ecx
 
186
        addl    $0x200, %esi
 
187
#endif
183
188
        movl    $DATA_ADDR, %edi
184
189
 
185
190
        call    LOCAL(move_memory)
196
201
1:
197
202
 
198
203
        movl    %ss:(DATA_ADDR + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE), %ecx
 
204
#if GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART + 4 < 0x200
199
205
        addl    $(GRUB_KERNEL_MACHINE_RAW_SIZE - 0x200), %ecx
 
206
#else
 
207
        addl    $(GRUB_KERNEL_MACHINE_RAW_SIZE - (GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART + 4)), %ecx
 
208
#endif
200
209
 
201
210
2:
202
211
        call    LOCAL(move_memory)