Skip to content

Commit df359f0

Browse files
rosslagerwalljgross1
authored andcommitted
xen/efi: Set nonblocking callbacks
Other parts of the kernel expect these nonblocking EFI callbacks to exist and crash when running under Xen. Since the implementations of xen_efi_set_variable() and xen_efi_query_variable_info() do not take any locks, use them for the nonblocking callbacks too. Signed-off-by: Ross Lagerwall <[email protected]> Reviewed-by: Juergen Gross <[email protected]> Signed-off-by: Juergen Gross <[email protected]>
1 parent a4098bc commit df359f0

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

arch/arm/xen/efi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ void __init xen_efi_runtime_setup(void)
1919
efi.get_variable = xen_efi_get_variable;
2020
efi.get_next_variable = xen_efi_get_next_variable;
2121
efi.set_variable = xen_efi_set_variable;
22+
efi.set_variable_nonblocking = xen_efi_set_variable;
2223
efi.query_variable_info = xen_efi_query_variable_info;
24+
efi.query_variable_info_nonblocking = xen_efi_query_variable_info;
2325
efi.update_capsule = xen_efi_update_capsule;
2426
efi.query_capsule_caps = xen_efi_query_capsule_caps;
2527
efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;

arch/x86/xen/efi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ static efi_system_table_t __init *xen_efi_probe(void)
6565
efi.get_variable = xen_efi_get_variable;
6666
efi.get_next_variable = xen_efi_get_next_variable;
6767
efi.set_variable = xen_efi_set_variable;
68+
efi.set_variable_nonblocking = xen_efi_set_variable;
6869
efi.query_variable_info = xen_efi_query_variable_info;
70+
efi.query_variable_info_nonblocking = xen_efi_query_variable_info;
6971
efi.update_capsule = xen_efi_update_capsule;
7072
efi.query_capsule_caps = xen_efi_query_capsule_caps;
7173
efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;

0 commit comments

Comments
 (0)