From 05b0bb91002e418297d0aa3f170e9aa08a495f1d Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Thu, 31 May 2012 14:06:11 +0200 Subject: [PATCH] * grub-core/loader/i386/linux.c (grub_linux_boot): Use right version. (grub_cmd_linux): Likewise. --- ChangeLog | 5 +++++ grub-core/loader/i386/linux.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e662e5158..316646267 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-05-31 Vladimir Serbinenko + + * grub-core/loader/i386/linux.c (grub_linux_boot): Use right version. + (grub_cmd_linux): Likewise. + 2012-05-31 Christer Weinigel Fix EHCI low-speed. diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c index 9cedac265..6e8238eec 100644 --- a/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c @@ -627,7 +627,7 @@ grub_linux_boot (void) params->v0208.efi_mmap_size = efi_mmap_size; #ifdef __x86_64__ - params->v0206.efi_mmap_hi = (efi_mmap_target >> 32); + params->v0208.efi_mmap_hi = (efi_mmap_target >> 32); #endif } else if (grub_le_to_cpu16 (params->version) >= 0x0206) @@ -846,10 +846,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), if (grub_le_to_cpu16 (params->version) >= 0x0208) { - params->v0206.efi_signature = GRUB_LINUX_EFI_SIGNATURE; - params->v0206.efi_system_table = (grub_uint32_t) (unsigned long) grub_efi_system_table; + params->v0208.efi_signature = GRUB_LINUX_EFI_SIGNATURE; + params->v0208.efi_system_table = (grub_uint32_t) (unsigned long) grub_efi_system_table; #ifdef __x86_64__ - params->v0206.efi_system_table_hi = (grub_uint32_t) ((grub_uint64_t) grub_efi_system_table >> 32); + params->v0208.efi_system_table_hi = (grub_uint32_t) ((grub_uint64_t) grub_efi_system_table >> 32); #endif } else if (grub_le_to_cpu16 (params->version) >= 0x0206)