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/fdt.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/fdt.c')
| -rw-r--r-- | drivers/firmware/efi/fdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/fdt.c b/drivers/firmware/efi/fdt.c index 5c6a8e8a9580..82d774161cc9 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); |