From 5678a5ad6b2560a293f757c0c74b3da45619bb9f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:31:52 -0500 Subject: [PATCH 101/105] linuxefi: minor cleanups Signed-off-by: Peter Jones --- grub-core/loader/i386/efi/linux.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c index a95e29700..806031838 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -61,13 +61,18 @@ grub_linuxefi_unload (void) grub_dl_unref (my_mod); loaded = 0; if (initrd_mem) - grub_efi_free_pages((grub_efi_physical_address_t)initrd_mem, BYTES_TO_PAGES(params->ramdisk_size)); + grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem, + BYTES_TO_PAGES(params->ramdisk_size)); if (linux_cmdline) - grub_efi_free_pages((grub_efi_physical_address_t)linux_cmdline, BYTES_TO_PAGES(params->cmdline_size + 1)); + grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t) + linux_cmdline, + BYTES_TO_PAGES(params->cmdline_size + 1)); if (kernel_mem) - grub_efi_free_pages((grub_efi_physical_address_t)kernel_mem, BYTES_TO_PAGES(kernel_size)); + grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem, + BYTES_TO_PAGES(kernel_size)); if (params) - grub_efi_free_pages((grub_efi_physical_address_t)params, BYTES_TO_PAGES(16384)); + grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params, + BYTES_TO_PAGES(16384)); return GRUB_ERR_NONE; } @@ -117,7 +122,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), grub_dprintf ("linuxefi", "initrd_mem = %lx\n", (unsigned long) initrd_mem); params->ramdisk_size = size; - params->ramdisk_image = (grub_uint32_t)(grub_uint64_t) initrd_mem; + params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem; ptr = initrd_mem; @@ -144,7 +149,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), grub_free (files); if (initrd_mem && grub_errno) - grub_efi_free_pages((grub_efi_physical_address_t)initrd_mem, BYTES_TO_PAGES(size)); + grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem, + BYTES_TO_PAGES(size)); return grub_errno; } @@ -251,7 +257,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), linux_cmdline + sizeof (LINUX_IMAGE) - 1, lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1)); - lh.cmd_line_ptr = (grub_uint32_t)(grub_uint64_t)linux_cmdline; + lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline; handover_offset = lh.handover_offset; @@ -296,13 +302,17 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), } if (linux_cmdline && !loaded) - grub_efi_free_pages((grub_efi_physical_address_t)linux_cmdline, BYTES_TO_PAGES(lh.cmdline_size + 1)); + grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t) + linux_cmdline, + BYTES_TO_PAGES(lh.cmdline_size + 1)); if (kernel_mem && !loaded) - grub_efi_free_pages((grub_efi_physical_address_t)kernel_mem, BYTES_TO_PAGES(kernel_size)); + grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem, + BYTES_TO_PAGES(kernel_size)); if (params && !loaded) - grub_efi_free_pages((grub_efi_physical_address_t)params, BYTES_TO_PAGES(16384)); + grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params, + BYTES_TO_PAGES(16384)); return grub_errno; } -- 2.13.0