diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:20 +0000 |
| commit | d0be45d365471f0cd3b9aef8613507bc764979b6 (patch) | |
| tree | 9305f24511bf974cb4ff44a968668244cc2fe14b /arch/x86/boot/compressed/eboot.c | |
| parent | acdf91f9c4d791cec5ca7b4ecae9522bd7054b05 (diff) | |
| parent | 250e8659c56d94320b877f659be45b8de130fa31 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-android-15.01
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; |