Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc754790 authored by Jan Beulich's avatar Jan Beulich Committed by Matt Fleming
Browse files

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: default avatarJan Beulich <jbeulich@suse.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Stefan Hasko <hasko.stevo@gmail.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 791eb564

arch/x86/boot/compressed/eboot.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -256,10 +256,10 @@ static efi_status_t setup_efi_pci(struct boot_params *params) 
	int i;

	int i;

	struct setup_data *data;

	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)

	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,

	status = efi_call_phys5(sys_table->boottime->locate_handle,

				EFI_LOCATE_BY_PROTOCOL, &pci_proto,

				EFI_LOCATE_BY_PROTOCOL, &pci_proto,
@@ -345,9 +345,9 @@ static efi_status_t setup_efi_pci(struct boot_params *params) 
		memcpy(rom->romdata, pci->romimage, pci->romsize);

		memcpy(rom->romdata, pci->romimage, pci->romsize);





		if (data)

		if (data)

			data->next = (uint64_t)rom;

			data->next = (unsigned long)rom;

		else

		else

			params->hdr.setup_data = (uint64_t)rom;

			params->hdr.setup_data = (unsigned long)rom;





		data = (struct setup_data *)rom;

		data = (struct setup_data *)rom;