← Back to branch summary

~colinb/grub/cdbmain

« back to all changes in this revision

Viewing changes to boot/i386/pc/lnxboot.S

  • Committer: Colin D Bennett
  • Date: 2008-08-03 03:57:46 UTC
  • mfrom: (820.8.1 trunk-clean)
  • Revision ID: colin@gibibit.com-20080803035746-0zn13x8oznory84l
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
boot/i386/pc/lnxboot.S
186
186
        call    move_memory
187
187
 
188
188
        /* Check for multiboot signature.  */
189
 
        cmpl    $MULTIBOOT_MAGIC, %ss:(DATA_ADDR + 0x50)
 
189
        cmpl    $MULTIBOOT_MAGIC, %ss:(DATA_ADDR + GRUB_KERNEL_MACHINE_DATA_END)
190
190
        jz      1f
191
191
 
192
192
        movl    (ramdisk_image - start), %esi