Messages in this thread Patch in this message |  | | Date | Mon, 14 Jan 2013 08:59:32 +0000 | From | "Jan Beulich" <> | Subject | [PATCH] fix setup_efi_pci() |
| |
This fixes three issues: - missing parentheses around a flag test - wrong memory type used for allocation intended to persist post-boot - four similar build warnings on 32-bit (casts between different size pointers and integers)
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- arch/x86/boot/compressed/eboot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
--- 3.8-rc3/arch/x86/boot/compressed/eboot.c +++ 3.8-rc3-x86-EFI-PCI-ROMs/arch/x86/boot/compressed/eboot.c @@ -256,10 +256,10 @@ static efi_status_t setup_efi_pci(struct int i; struct setup_data *data; - data = (struct setup_data *)params->hdr.setup_data; + data = (struct setup_data *)(unsigned long)params->hdr.setup_data; while (data && data->next) - data = (struct setup_data *)data->next; + data = (struct setup_data *)(unsigned long)data->next; status = efi_call_phys5(sys_table->boottime->locate_handle, EFI_LOCATE_BY_PROTOCOL, &pci_proto, @@ -302,7 +302,7 @@ static efi_status_t setup_efi_pci(struct if (status != EFI_SUCCESS) continue; - if (!attributes & EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM) + if (!(attributes & EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM)) continue; if (!pci->romimage || !pci->romsize) @@ -311,7 +311,7 @@ static efi_status_t setup_efi_pci(struct size = pci->romsize + sizeof(*rom); status = efi_call_phys3(sys_table->boottime->allocate_pool, - EFI_LOADER_DATA, size, &rom); + EFI_RUNTIME_SERVICES_DATA, size, &rom); if (status != EFI_SUCCESS) continue; @@ -345,9 +345,9 @@ static efi_status_t setup_efi_pci(struct memcpy(rom->romdata, pci->romimage, pci->romsize); if (data) - data->next = (uint64_t)rom; + data->next = (unsigned long)rom; else - params->hdr.setup_data = (uint64_t)rom; + params->hdr.setup_data = (unsigned long)rom; data = (struct setup_data *)rom;
|  |