diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-09-20 09:55:39 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-08 19:21:04 +0100 |
| commit | ffb248aa56558bcb1492cb2504e721e9a26a9144 (patch) | |
| tree | 9e1ae7ad5264168425b8ad2c8464855da5a3d41d /arch/x86/boot | |
| parent | 8ff22e6d038d5edabd1aea7bc8e84571b8438b72 (diff) | |
efi: x86: Handle arbitrary Unicode characters
Instead of truncating UTF-16 assuming all characters is ASCII,
properly convert it to UTF-8.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
[ Bug and style fixes. ]
Signed-off-by: Roy Franz <roy.franz@linaro.org>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
(cherry picked from commit c625d1c203941fad755eb4eb729db1f65d6e9836)
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'arch/x86/boot')
| -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 a7677babf946..feca05fa4536 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -488,8 +488,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; |