* grub-core/loader/i386/linux.c (grub_linux_boot): Use right version.

	(grub_cmd_linux): Likewise.

diff --git a/ChangeLog b/ChangeLog
index e662e51583643e156552a763acb3d2cbc0e6e787..316646267f3759f7166afd8d3c18fdd512afc9aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/i386/linux.c (grub_linux_boot): Use right version.
+       (grub_cmd_linux): Likewise.
+
 2012-05-31  Christer Weinigel <christer@weinigel.se>
 
        Fix EHCI low-speed.

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 9cedac2656f2c94c1f97c5dfae3e458bd1bbfc2b..6e8238eec5d13222db3046110c61a7740b2b755f 100644 (file)
--- 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)