diff options
author | Jan Beulich <JBeulich@suse.com> | 2013-01-18 07:35:14 -0500 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-01-25 05:22:53 -0500 |
commit | bc754790f932f3466ec521ee792da2791e7003ae (patch) | |
tree | c7e75a6f0d8fb52f39c383d557ff8a0359be97ae /arch | |
parent | 791eb564d218dabe0f9a2212916fe54240b97afb (diff) |
x86, efi: fix 32-bit warnings in setup_efi_pci()
Fix four similar build warnings on 32-bit (casts between different
size pointers and integers).
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Stefan Hasko <hasko.stevo@gmail.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/boot/compressed/eboot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 18e329ca108e..3f3d36f5a800 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c | |||
@@ -256,10 +256,10 @@ static efi_status_t setup_efi_pci(struct boot_params *params) | |||
256 | int i; | 256 | int i; |
257 | struct setup_data *data; | 257 | struct setup_data *data; |
258 | 258 | ||
259 | data = (struct setup_data *)params->hdr.setup_data; | 259 | data = (struct setup_data *)(unsigned long)params->hdr.setup_data; |
260 | 260 | ||
261 | while (data && data->next) | 261 | while (data && data->next) |
262 | data = (struct setup_data *)data->next; | 262 | data = (struct setup_data *)(unsigned long)data->next; |
263 | 263 | ||
264 | status = efi_call_phys5(sys_table->boottime->locate_handle, | 264 | status = efi_call_phys5(sys_table->boottime->locate_handle, |
265 | EFI_LOCATE_BY_PROTOCOL, &pci_proto, | 265 | EFI_LOCATE_BY_PROTOCOL, &pci_proto, |
@@ -345,9 +345,9 @@ static efi_status_t setup_efi_pci(struct boot_params *params) | |||
345 | memcpy(rom->romdata, pci->romimage, pci->romsize); | 345 | memcpy(rom->romdata, pci->romimage, pci->romsize); |
346 | 346 | ||
347 | if (data) | 347 | if (data) |
348 | data->next = (uint64_t)rom; | 348 | data->next = (unsigned long)rom; |
349 | else | 349 | else |
350 | params->hdr.setup_data = (uint64_t)rom; | 350 | params->hdr.setup_data = (unsigned long)rom; |
351 | 351 | ||
352 | data = (struct setup_data *)rom; | 352 | data = (struct setup_data *)rom; |
353 | 353 | ||