x86, efi: Fix a build warning [Linux 3.9]

This Linux kernel change "x86, efi: Fix a build warning" is included in the Linux 3.9 release. This change is authored by Borislav Petkov <bp [at] suse.de> on Wed Apr 24 12:09:14 2013 +0200. The commit for this change in Linux stable tree is 51f8fbb (patch).

x86, efi: Fix a build warning

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 <[email protected]>
Cc: Matthew Garrett <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Signed-off-by: Matt Fleming <[email protected]>

There are 2 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 arch/x86/boot/compressed/eboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 8615f75..41de115 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -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,

Leave a Reply

Your email address will not be published. Required fields are marked *