Merge tag 'v4.16-rc3' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -439,7 +439,7 @@ setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height)
|
||||
struct efi_uga_draw_protocol *uga = NULL, *first_uga;
|
||||
efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;
|
||||
unsigned long nr_ugas;
|
||||
u32 *handles = (u32 *)uga_handle;;
|
||||
u32 *handles = (u32 *)uga_handle;
|
||||
efi_status_t status = EFI_INVALID_PARAMETER;
|
||||
int i;
|
||||
|
||||
@@ -484,7 +484,7 @@ setup_uga64(void **uga_handle, unsigned long size, u32 *width, u32 *height)
|
||||
struct efi_uga_draw_protocol *uga = NULL, *first_uga;
|
||||
efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;
|
||||
unsigned long nr_ugas;
|
||||
u64 *handles = (u64 *)uga_handle;;
|
||||
u64 *handles = (u64 *)uga_handle;
|
||||
efi_status_t status = EFI_INVALID_PARAMETER;
|
||||
int i;
|
||||
|
||||
|
Reference in New Issue
Block a user