Commit 564c3970 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@kernel.org>
parents 0ce6cda2 c158c3bf

arch/x86/platform/efi/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -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},

};



/*

drivers/firmware/efi/efi-stub-helper.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE