[syslinux:firmware] efi: fix a bunch of casting to different size warnings,

[syslinux-bot for Matt Fleming]

Commit-ID:  96669c1293445705f3d2917dac26b32a97efa577
Gitweb:     http://www.syslinux.org/commit/96669c1293445705f3d2917dac26b32a97efa577
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Thu, 20 Jun 2013 14:02:37 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Thu, 20 Jun 2013 14:02:37 +0100

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 at intel.com>

---
 efi/main.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/efi/main.c b/efi/main.c
index 4963dde..cc26457 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -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)