diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-23 16:56:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-23 16:56:37 +0000 |
| commit | 250e8659c56d94320b877f659be45b8de130fa31 (patch) | |
| tree | 71095fcd0b70a869ffc2589ec72bf2334b0643a6 /arch/x86/boot/compressed/eboot.c | |
| parent | 7adf3d9a27e4838d0af9250c53ad5744b84886ce (diff) | |
| parent | c7aae4d46ea5c7fb51edd68839588967ef2a7536 (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/arm64-efi' into linux-linaro-lsk-v3.14lsk-v3.14-15.01
Conflicts:
arch/arm64/kernel/Makefile
drivers/firmware/efi/efi-stub-helper.c
Diffstat (limited to 'arch/x86/boot/compressed/eboot.c')
| -rw-r--r-- | arch/x86/boot/compressed/eboot.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 78cbb2db5a85..832a6590e9b3 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -489,8 +489,7 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table) hdr->type_of_loader = 0x21; /* Convert unicode cmdline to ascii */ - cmdline_ptr = efi_convert_cmdline_to_ascii(sys_table, image, - &options_size); + cmdline_ptr = efi_convert_cmdline(sys_table, image, &options_size); if (!cmdline_ptr) goto fail; hdr->cmd_line_ptr = (unsigned long)cmdline_ptr; |