vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/loader/i386/linux.c: Use grub_addr_t rather than long when

Browse source 
appropriate.
This commit is contained in:
Vladimir Serbinenko 2013-12-15 14:37:12 +01:00
parent 24ca71c93b
commit 111bf5db8b
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-15 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/linux.c: Use grub_addr_t rather than long when
appropriate.
2013-12-15 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-15 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/linux.c: Use %p rather than %lx for pointers. * grub-core/loader/i386/linux.c: Use %p rather than %lx for pointers.

6
grub-core/loader/i386/linux.c
View file

@ -851,7 +851,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
if (grub_le_to_cpu16 (linux_params.version) >= 0x0208) if (grub_le_to_cpu16 (linux_params.version) >= 0x0208)
{ {
linux_params.v0208.efi_signature = GRUB_LINUX_EFI_SIGNATURE; linux_params.v0208.efi_signature = GRUB_LINUX_EFI_SIGNATURE;
linux_params.v0208.efi_system_table = (grub_uint32_t) (unsigned long) grub_efi_system_table; linux_params.v0208.efi_system_table = (grub_uint32_t) (grub_addr_t) grub_efi_system_table;
#ifdef __x86_64__ #ifdef __x86_64__
linux_params.v0208.efi_system_table_hi = (grub_uint32_t) ((grub_uint64_t) grub_efi_system_table >> 32); linux_params.v0208.efi_system_table_hi = (grub_uint32_t) ((grub_uint64_t) grub_efi_system_table >> 32);
#endif #endif
@ -859,12 +859,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
else if (grub_le_to_cpu16 (linux_params.version) >= 0x0206) else if (grub_le_to_cpu16 (linux_params.version) >= 0x0206)
{ {
linux_params.v0206.efi_signature = GRUB_LINUX_EFI_SIGNATURE; linux_params.v0206.efi_signature = GRUB_LINUX_EFI_SIGNATURE;
linux_params.v0206.efi_system_table = (grub_uint32_t) (unsigned long) grub_efi_system_table; linux_params.v0206.efi_system_table = (grub_uint32_t) (grub_addr_t) grub_efi_system_table;
} }
else if (grub_le_to_cpu16 (linux_params.version) >= 0x0204) else if (grub_le_to_cpu16 (linux_params.version) >= 0x0204)
{ {
linux_params.v0204.efi_signature = GRUB_LINUX_EFI_SIGNATURE_0204; linux_params.v0204.efi_signature = GRUB_LINUX_EFI_SIGNATURE_0204;
linux_params.v0204.efi_system_table = (grub_uint32_t) (unsigned long) grub_efi_system_table; linux_params.v0204.efi_system_table = (grub_uint32_t) (grub_addr_t) grub_efi_system_table;
} }
#endif #endif