diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-06-20 14:02:37 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-06-20 14:02:37 +0100 |
| commit | 96669c1293445705f3d2917dac26b32a97efa577 (patch) | |
| tree | c5bcc857c23468b685a0d2fe2b6ec21b70d2081e | |
| parent | a5558d169efd28df937a9c7c509fde25cae04d1f (diff) | |
| download | syslinux-96669c1293445705f3d2917dac26b32a97efa577.tar.gz syslinux-96669c1293445705f3d2917dac26b32a97efa577.tar.xz syslinux-96669c1293445705f3d2917dac26b32a97efa577.zip | |
efi: fix a bunch of casting to different size warnings,
e.g.
efi/main.c:997:30: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
efi/main.c:999:30: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | efi/main.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -990,9 +990,9 @@ int efi_boot_linux(void *kernel_buf, size_t kernel_size, if (!map) goto free_map; - _bp->efi.memmap = (uint32_t)(uint64_t)map; + _bp->efi.memmap = (uint32_t)(unsigned long)map; _bp->efi.memmap_size = nr_entries * desc_sz; - _bp->efi.systab = (uint32_t)(uint64_t)ST; + _bp->efi.systab = (uint32_t)(unsigned long)ST; _bp->efi.desc_size = desc_sz; _bp->efi.desc_version = desc_ver; #if defined(__x86_64__) @@ -1079,8 +1079,13 @@ int efi_boot_linux(void *kernel_buf, size_t kernel_size, /* NOTREACHED */ free_map: - if (_cmdline) efree((EFI_PHYSICAL_ADDRESS)_cmdline, strlen(_cmdline) + 1); - if (_bp) efree((EFI_PHYSICAL_ADDRESS)_bp, BOOT_PARAM_BLKSIZE); + if (_cmdline) + efree((EFI_PHYSICAL_ADDRESS)(unsigned long)_cmdline, + strlen(_cmdline) + 1); + + if (_bp) + efree((EFI_PHYSICAL_ADDRESS)(unsigned long)_bp, + BOOT_PARAM_BLKSIZE); if (kernel_start) efree(kernel_start, init_size); FreePool(map); if (irf_size) |