public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fix a recently introduced sparse warning caused by using 0 instead of

Browse source 
NULL - Leif Lindholm
 
  * Remove a useless memset from the common EFI stub code - Roy Franz
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.13 (GNU/Linux)
 
 iQIcBAABAgAGBQJSTxwNAAoJEC84WcCNIz1VGzIP/2RLkmaKy9jqkTpuOPx2ia7p
 maV6w3eWKNq2v2oeqgvP27YwmKLsh4VhYUoLbumxDmYCP9bbFDOjRkLSP2aK3SIo
 Tx7Se8IvMX/JbC90t3CA/MAeyFwpDoDSohVqvOYRMgNwHdU3CqC1nGxOSbtn+KBm
 Vl1dbk01c92DgmZumATS5VOsqIZzaHvV5HQFLm9foKtabUAEYT8vNoFdd17zJoSp
 /DwZinW0q1D1tEj2vUy9LvbpyhAU9m9O9/GXBX72/lbQbH0R6uCHtEYwu8Pv3nd2
 +ai1xC8YN2sKg50WHeqMVxXDWHtQQDpbIy9wPFdbmUiy8gkQ+Y1ROjcnV5Ul9oYG
 qJq4ldmFOFygMj3jrt6uOUsnloWQOBCq/To3npakc0P61PRNaCXW0ejZUZB/5OeM
 TLripu0oe9NDLyEWlEgB9gZmjRsYhm37t5eWr/d/DKn8+JW5EeZzMUzz/WxdPq7e
 hcOi7RIlCprc74AjXNU1MXPlUpJc3V3xd2eZrall2QahsSNUH0gbDwKcn1rBvVeP
 VJjv/jGA2cTNERHIqD1wVnQ7wreXlLl1fxsmAYHCbTAAXxDYKMBDjWtkuGbvxc23
 a5USgCxCYEfACU/KaLo2HlxO9zi7rLbVs+9liuO8aPfEQenYbd9OsoXdsvlwG8hL
 5c8fpDXPvW1j2mabrUBr
 =Sdvo
 -----END PGP SIGNATURE-----

Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/efi

Pull EFI updates from Matt Fleming:

 * Fix a recently introduced sparse warning caused by using 0 instead of
   NULL - Leif Lindholm

 * Remove a useless memset from the common EFI stub code - Roy Franz

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2013-10-06 11:24:57 +02:00
commit 564c39701c
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/platform/efi/efi.c
View file

@ -71,7 +71,7 @@ static __initdata efi_config_table_type_t arch_tables[] = {
#ifdef CONFIG_X86_UV
{UV_SYSTEM_TABLE_GUID, "UVsystab", &efi.uv_systab},
#endif
{NULL_GUID, NULL, 0},
{NULL_GUID, NULL, NULL},
};
/*

2
drivers/firmware/efi/efi-stub-helper.c
View file

@ -567,8 +567,6 @@ static efi_status_t efi_relocate_kernel(efi_system_table_t *sys_table_arg,
* have been allocated by UEFI, so we can safely use memcpy.
*/
memcpy((void *)new_addr, (void *)cur_image_addr, image_size);
/* Zero any extra space we may have allocated for BSS. */
memset((void *)(new_addr + image_size), alloc_size - image_size, 0);
/* Return the new address of the relocated image. */
*image_addr = new_addr;