diff --git a/ChangeLog b/ChangeLog index 8dfaf47d4..6fb80b43a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-12-18 Allen Pais +2013-12-18 Bob Picco + + * grub-core/boot/sparc64/ieee1275/boot.S: Fix order of fields. + 2013-12-18 Vladimir Serbinenko Make grub_zlib_decompress handle incomplete chunks. diff --git a/grub-core/boot/sparc64/ieee1275/boot.S b/grub-core/boot/sparc64/ieee1275/boot.S index efe090e0c..507367749 100644 --- a/grub-core/boot/sparc64/ieee1275/boot.S +++ b/grub-core/boot/sparc64/ieee1275/boot.S @@ -44,8 +44,8 @@ pic_base: . = _start + GRUB_BOOT_MACHINE_BOOT_DEVPATH boot_path: . = _start + GRUB_BOOT_MACHINE_KERNEL_BYTE -kernel_byte: .xword (2 << 9) boot_path_end: +kernel_byte: .xword (2 << 9) kernel_address: .word GRUB_BOOT_MACHINE_KERNEL_ADDR #else #define boot_path (_start + 512 + SCRATCH_PAD_BOOT_SIZE)