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>

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[] = {
 #ifdef CONFIG_X86_UV
         {UV_SYSTEM_TABLE_GUID, "UVsystab", &efi.uv_systab},
 #endif
-        {NULL_GUID, NULL, 0},
+        {NULL_GUID, NULL, NULL},
 };
 
 /*
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;