History

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

H. Peter Anvin committed 12 years ago

Commit ba3f35c2 parents 6a89d71 783ee433 files · +5 −5Browse files

Unified · Split

3 files
  1. drivers/firmware/efi/efi-pstore.c +1 −1
  2. drivers/firmware/efi/efi.c +3 −3
  3. drivers/firmware/efi/fdt.c +1 −1
drivers/firmware/efi/efi-pstore.c+1−1
@@ -40,7 +40,7 @@ struct pstore_read_data { · 39 unmodified lines
4040 static inline u64 generic_id(unsigned long timestamp,
4141 unsigned int part, int count)
4242 {
43− return (timestamp * 100 + part) * 1000 + count;
43+ return ((u64) timestamp * 100 + part) * 1000 + count;
4444 }
4545
4646 static int efi_pstore_read_func(struct efivar_entry *entry, void *data)
drivers/firmware/efi/efi.c+3−3
@@ -353,10 +353,10 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname, · 352 unmodified lines
353353 int depth, void *data)
354354 {
355355 struct param_info *info = data;
356− void *prop, *dest;
357− unsigned long len;
356+ const void *prop;
357+ void *dest;
358358 u64 val;
359− int i;
359+ int i, len;
360360
361361 if (depth != 1 ||
362362 (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
drivers/firmware/efi/fdt.c+1−1
@@ -63,7 +63,7 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, · 62 unmodified lines
6363 */
6464 prev = 0;
6565 for (;;) {
66− const char *type, *name;
66+ const char *type;
6767 int len;
6868
6969 node = fdt_next_node(fdt, prev, NULL);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t