lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'efi-urgent' into x86/urgent

Browse Source 
* 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>
This commit is contained in:
H. Peter Anvin
2014-06-27 07:55:24 -07:00
parent 6a89d71078 783ee43118
commit ba3f35c7ce
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/firmware/efi/efi-pstore.c
View File

@@ -40,7 +40,7 @@ struct pstore_read_data {
static inline u64 generic_id(unsigned long timestamp, static inline u64 generic_id(unsigned long timestamp,
unsigned int part, int count) 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) static int efi_pstore_read_func(struct efivar_entry *entry, void *data)

6
drivers/firmware/efi/efi.c
View File

@@ -353,10 +353,10 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname,
int depth, void *data) int depth, void *data)
{ {
struct param_info *info = data; struct param_info *info = data;
void *prop, *dest; const void *prop;
unsigned long len; void *dest;
u64 val; u64 val;
int i; int i, len;
if (depth != 1 || if (depth != 1 ||
(strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0)) (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))

2
drivers/firmware/efi/fdt.c
View File

@@ -63,7 +63,7 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt,
*/ */
prev = 0; prev = 0;
for (;;) { for (;;) {
const char *type, *name; const char *type;
int len; int len;
node = fdt_next_node(fdt, prev, NULL); node = fdt_next_node(fdt, prev, NULL);