aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/platform/efi/efi.c2
-rw-r--r--drivers/firmware/efi/efi-stub-helper.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index fbc1d70188f8..1d3372ac9c66 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -71,7 +71,7 @@ static __initdata efi_config_table_type_t arch_tables[] = {
71#ifdef CONFIG_X86_UV 71#ifdef CONFIG_X86_UV
72 {UV_SYSTEM_TABLE_GUID, "UVsystab", &efi.uv_systab}, 72 {UV_SYSTEM_TABLE_GUID, "UVsystab", &efi.uv_systab},
73#endif 73#endif
74 {NULL_GUID, NULL, 0}, 74 {NULL_GUID, NULL, NULL},
75}; 75};
76 76
77/* 77/*
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,
567 * have been allocated by UEFI, so we can safely use memcpy. 567 * have been allocated by UEFI, so we can safely use memcpy.
568 */ 568 */
569 memcpy((void *)new_addr, (void *)cur_image_addr, image_size); 569 memcpy((void *)new_addr, (void *)cur_image_addr, image_size);
570 /* Zero any extra space we may have allocated for BSS. */
571 memset((void *)(new_addr + image_size), alloc_size - image_size, 0);
572 570
573 /* Return the new address of the relocated image. */ 571 /* Return the new address of the relocated image. */
574 *image_addr = new_addr; 572 *image_addr = new_addr;