diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2014-06-27 14:55:24 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2014-06-27 14:55:24 (GMT) |
| commit | ba3f35c7ce443c829bd806202ce29fa36d322ff3 (patch) | |
| tree | e25416124cfaf059d4e2f38c29f4630a2fc58571 /drivers | |
| parent | 6a89d71078dad9b1c49ccdf1ffa656fbe36ccd1e (diff) | |
| parent | 783ee43118dc773bc8b0342c5b230e017d5a04d0 (diff) | |
| download | linux-ba3f35c7ce443c829bd806202ce29fa36d322ff3.tar.xz | |
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')
| -rw-r--r-- | drivers/firmware/efi/efi-pstore.c | 2 | ||||
| -rw-r--r-- | drivers/firmware/efi/efi.c | 6 | ||||
| -rw-r--r-- | drivers/firmware/efi/fdt.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c index 4b9dc83..e992abc 100644 --- a/drivers/firmware/efi/efi-pstore.c +++ b/drivers/firmware/efi/efi-pstore.c @@ -40,7 +40,7 @@ struct pstore_read_data { static inline u64 generic_id(unsigned long timestamp, unsigned int part, int count) { - return (timestamp * 100 + part) * 1000 + count; + return ((u64) timestamp * 100 + part) * 1000 + count; } static int efi_pstore_read_func(struct efivar_entry *entry, void *data) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index cd36deb..eff1a2f 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)) diff --git a/drivers/firmware/efi/fdt.c b/drivers/firmware/efi/fdt.c index 5c6a8e8..82d7741 100644 --- a/drivers/firmware/efi/fdt.c +++ b/drivers/firmware/efi/fdt.c @@ -63,7 +63,7 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, */ prev = 0; for (;;) { - const char *type, *name; + const char *type; int len; node = fdt_next_node(fdt, prev, NULL); |