summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-06 11:24:57 +0200
committerIngo Molnar <mingo@kernel.org>2013-10-06 11:24:57 +0200
commit564c39701c8c52f2310a425223a04d175ed287c4 (patch)
treeee222f5f61f82555dd1422dcdf673dbcd6142bd4 /drivers
parent0ce6cda2c75d64175394341ef60e6e1d27dd9c10 (diff)
parentc158c3bf59951bbb44bd7ccca9e6665dfd1617c5 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firmware/efi/efi-stub-helper.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c
index cc0581daa9ed..b6bffbfd3be7 100644
--- a/drivers/firmware/efi/efi-stub-helper.c
+++ b/drivers/firmware/efi/efi-stub-helper.c
@@ -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;