diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2014-06-27 07:55:24 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2014-06-27 07:55:24 -0700 |
| commit | ba3f35c7ce443c829bd806202ce29fa36d322ff3 (patch) | |
| tree | e25416124cfaf059d4e2f38c29f4630a2fc58571 /drivers/firmware/efi/efi.c | |
| parent | 6a89d71078dad9b1c49ccdf1ffa656fbe36ccd1e (diff) | |
| parent | 783ee43118dc773bc8b0342c5b230e017d5a04d0 (diff) | |
Merge tag 'efi-urgent' into x86/urgent
* Fix a few compiler warnings (one being a real bug) in the arm64 EFI
code that lots of people are running into and reporting - Catalin Marinas
* Use a cast to avoid a 32-bit overflow issue when generating pstore
filenames - Andrzej Zaborowski
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/firmware/efi/efi.c')
| -rw-r--r-- | drivers/firmware/efi/efi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index cd36deb619f..eff1a2f22f0 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -353,10 +353,10 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname, int depth, void *data) { struct param_info *info = data; - void *prop, *dest; - unsigned long len; + const void *prop; + void *dest; u64 val; - int i; + int i, len; if (depth != 1 || (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0)) |