]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
x86, efi: Fix a build warning
authorBorislav Petkov <bp@suse.de>
Wed, 24 Apr 2013 10:09:14 +0000 (12:09 +0200)
committerMatt Fleming <matt.fleming@intel.com>
Wed, 24 Apr 2013 10:57:15 +0000 (11:57 +0100)
Fix this:

arch/x86/boot/compressed/eboot.c: In function ‘setup_efi_vars’:
arch/x86/boot/compressed/eboot.c:269:2: warning: passing argument 1 of ‘efi_call_phys’ makes pointer from integer without a cast [enabled by default]
In file included from arch/x86/boot/compressed/eboot.c:12:0:
/w/kernel/linux/arch/x86/include/asm/efi.h:8:33: note: expected ‘void *’ but argument is of type ‘long unsigned int’

after cc5a080c5d40 ("efi: Pass boot services variable info to runtime
code").

Reported-by: Paul Bolle <pebolle@tiscali.nl>
Cc: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
arch/x86/boot/compressed/eboot.c

index 8615f7581820d44ef7cd652c8ef2662310ac5122..41de115a55b79fa47d6df6cacaadedd332c1b478 100644 (file)
@@ -266,7 +266,7 @@ static efi_status_t setup_efi_vars(struct boot_params *params)
        while (data && data->next)
                data = (struct setup_data *)(unsigned long)data->next;
 
-       status = efi_call_phys4(sys_table->runtime->query_variable_info,
+       status = efi_call_phys4((void *)sys_table->runtime->query_variable_info,
                                EFI_VARIABLE_NON_VOLATILE |
                                EFI_VARIABLE_BOOTSERVICE_ACCESS |
                                EFI_VARIABLE_RUNTIME_ACCESS, &store_size,