Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'efi-urgent' into x86/urgent
* The EFI variable anti-bricking algorithm merged in -rc8 broke booting
on some Apple machines because they implement EFI spec 1.10, which
doesn't provide a QueryVariableInfo() runtime function and the logic
used to check for the existence of that function was insufficient.
Fix from Josh Boyer.
* The anti-bricking algorithm also introduced a compiler warning on
32-bit. Fix from Borislav Petkov.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
+2
-2
+2
-2
arch/x86/boot/compressed/eboot.c
+2
-2
arch/x86/boot/compressed/eboot.c
···
258
258
u64 store_size, remaining_size, var_size;
259
259
efi_status_t status;
260
260
261
-
if (!sys_table->runtime->query_variable_info)
261
+
if (sys_table->runtime->hdr.revision < EFI_2_00_SYSTEM_TABLE_REVISION)
262
262
return EFI_UNSUPPORTED;
263
263
264
264
data = (struct setup_data *)(unsigned long)params->hdr.setup_data;
···
266
266
while (data && data->next)
267
267
data = (struct setup_data *)(unsigned long)data->next;
268
268
269
-
status = efi_call_phys4(sys_table->runtime->query_variable_info,
269
+
status = efi_call_phys4((void *)sys_table->runtime->query_variable_info,
270
270
EFI_VARIABLE_NON_VOLATILE |
271
271
EFI_VARIABLE_BOOTSERVICE_ACCESS |
272
272
EFI_VARIABLE_RUNTIME_ACCESS, &store_size,