* include/grub/i386/linux.h (linux_kernel_params): Add v206.

* grub-core/loader/i386/linux.c (grub_linux_boot): Use v206.
	(grub_cmd_linux) [__x86_64__]: Validate grub_efi_system_table.
This commit is contained in:
Peter Jones 2012-05-31 13:23:30 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent f19cb95e1d
commit bcc75fb3f7
3 changed files with 43 additions and 6 deletions

View file

@ -234,6 +234,17 @@ struct linux_kernel_params
grub_uint32_t efi_mmap_size; /* 1cc */
grub_uint32_t efi_mmap; /* 1d0 */
} v0204;
struct
{
grub_uint32_t padding7_1; /* 1b8 */
grub_uint32_t padding7_2; /* 1bc */
grub_uint32_t efi_signature; /* 1c0 */
grub_uint32_t efi_system_table; /* 1c4 */
grub_uint32_t efi_mem_desc_size; /* 1c8 */
grub_uint32_t efi_mem_desc_version; /* 1cc */
grub_uint32_t efi_mmap; /* 1d0 */
grub_uint32_t efi_mmap_size; /* 1d4 */
} v0206;
struct
{
grub_uint32_t padding7_1; /* 1b8 */
@ -246,7 +257,7 @@ struct linux_kernel_params
grub_uint32_t efi_mmap_size; /* 1d4 */
grub_uint32_t efi_system_table_hi; /* 1d8 */
grub_uint32_t efi_mmap_hi; /* 1dc */
} v0206;
} v0208;
};
grub_uint32_t alt_mem; /* 1e0 */