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

Commit 61e31291 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-fix-ia64-warnings' of... 

Merge tag 'please-pull-fix-ia64-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

P{ill ia64 warning fix from Tony Luck:
 "Add some casts to avoid warnings from efi_runtime_services_t members"

* tag 'please-pull-fix-ia64-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] sim: Add casts to avoid assignment warnings
parents 496322bc 44840098

arch/ia64/hp/sim/boot/fw-emu.c

+10 −10
Original line number Diff line number Diff line
@@ -290,16 +290,16 @@ sys_fw_init (const char *args, int arglen) 
	efi_runtime->hdr.signature = EFI_RUNTIME_SERVICES_SIGNATURE;

	efi_runtime->hdr.revision = EFI_RUNTIME_SERVICES_REVISION;

	efi_runtime->hdr.headersize = sizeof(efi_runtime->hdr);

	efi_runtime->get_time = __pa(&fw_efi_get_time);

	efi_runtime->set_time = __pa(&efi_unimplemented);

	efi_runtime->get_wakeup_time = __pa(&efi_unimplemented);

	efi_runtime->set_wakeup_time = __pa(&efi_unimplemented);

	efi_runtime->set_virtual_address_map = __pa(&efi_unimplemented);

	efi_runtime->get_variable = __pa(&efi_unimplemented);

	efi_runtime->get_next_variable = __pa(&efi_unimplemented);

	efi_runtime->set_variable = __pa(&efi_unimplemented);

	efi_runtime->get_next_high_mono_count = __pa(&efi_unimplemented);

	efi_runtime->reset_system = __pa(&efi_reset_system);

	efi_runtime->get_time = (void *)__pa(&fw_efi_get_time);

	efi_runtime->set_time = (void *)__pa(&efi_unimplemented);

	efi_runtime->get_wakeup_time = (void *)__pa(&efi_unimplemented);

	efi_runtime->set_wakeup_time = (void *)__pa(&efi_unimplemented);

	efi_runtime->set_virtual_address_map = (void *)__pa(&efi_unimplemented);

	efi_runtime->get_variable = (void *)__pa(&efi_unimplemented);

	efi_runtime->get_next_variable = (void *)__pa(&efi_unimplemented);

	efi_runtime->set_variable = (void *)__pa(&efi_unimplemented);

	efi_runtime->get_next_high_mono_count = (void *)__pa(&efi_unimplemented);

	efi_runtime->reset_system = (void *)__pa(&efi_reset_system);



	efi_tables->guid = SAL_SYSTEM_TABLE_GUID;

	efi_tables->table = __pa(sal_systab);