* 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
Unified · Split
| @@ -40,7 +40,7 @@ struct pstore_read_data { · 39 unmodified lines | |||
| 40 | static inline u64 generic_id(unsigned long timestamp, | 40 | static inline u64 generic_id(unsigned long timestamp, |
| 41 | unsigned int part, int count) | 41 | unsigned int part, int count) |
| 42 | { | 42 | { |
| 43 | return (timestamp * 100 + part) * 1000 + count; | 43 | return ((u64) timestamp * 100 + part) * 1000 + count; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | static int efi_pstore_read_func(struct efivar_entry *entry, void *data) | 46 | static int efi_pstore_read_func(struct efivar_entry *entry, void *data) |
| @@ -353,10 +353,10 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname, · 352 unmodified lines | |||
| 353 | int depth, void *data) | 353 | int depth, void *data) |
| 354 | { | 354 | { |
| 355 | struct param_info *info = data; | 355 | struct param_info *info = data; |
| 356 | void *prop, *dest; | 356 | const void *prop; |
| 357 | unsigned long len; | 357 | void *dest; |
| 358 | u64 val; | 358 | u64 val; |
| 359 | int i; | 359 | int i, len; |
| 360 | 360 | ||
| 361 | if (depth != 1 || | 361 | if (depth != 1 || |
| 362 | (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0)) | 362 | (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0)) |
| @@ -63,7 +63,7 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, · 62 unmodified lines | |||
| 63 | */ | 63 | */ |
| 64 | prev = 0; | 64 | prev = 0; |
| 65 | for (;;) { | 65 | for (;;) { |
| 66 | const char *type, *name; | 66 | const char *type; |
| 67 | int len; | 67 | int len; |
| 68 | 68 | ||
| 69 | node = fdt_next_node(fdt, prev, NULL); | 69 | node = fdt_next_node(fdt, prev, NULL); |