mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
efi: efi-stub-helper cleanup
An #ifdef CONFIG_ARM clause in efi-stub-helper.c got included with some of the generic stub rework by Roy Franz. Drop it here to make subsequent patches less confusing. Also, In handle_cmdline_files(), fh is not initialized, and while the overall logic around this handling appears safe, gcc does not always pick this up. Initialize to NULL to remove the resulting warning. Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
This commit is contained in:
parent
c9eaa447e7
commit
9403e462fb
1 changed files with 3 additions and 13 deletions
|
@ -267,7 +267,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
|
|||
struct file_info *files;
|
||||
unsigned long file_addr;
|
||||
u64 file_size_total;
|
||||
efi_file_handle_t *fh;
|
||||
efi_file_handle_t *fh = NULL;
|
||||
efi_status_t status;
|
||||
int nr_files;
|
||||
char *str;
|
||||
|
@ -536,18 +536,8 @@ static char *efi_convert_cmdline_to_ascii(efi_system_table_t *sys_table_arg,
|
|||
}
|
||||
|
||||
options_size++; /* NUL termination */
|
||||
#ifdef CONFIG_ARM
|
||||
/*
|
||||
* For ARM, allocate at a high address to avoid reserved
|
||||
* regions at low addresses that we don't know the specfics of
|
||||
* at the time we are processing the command line.
|
||||
*/
|
||||
status = efi_high_alloc(sys_table_arg, options_size, 0,
|
||||
&cmdline_addr, 0xfffff000);
|
||||
#else
|
||||
status = efi_low_alloc(sys_table_arg, options_size, 0,
|
||||
&cmdline_addr);
|
||||
#endif
|
||||
|
||||
status = efi_low_alloc(sys_table_arg, options_size, 0, &cmdline_addr);
|
||||
if (status != EFI_SUCCESS)
|
||||
return NULL;
|
||||
|
||||
|
|
Loading…
Reference in a new issue