diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-10-12 13:38:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-10-12 13:38:31 +0200 |
| commit | 4d0a4388ccdd9482fef6b26f879d0f6099143f80 (patch) | |
| tree | b711a02c0cf93d50ac206511e879b4d3521d12b7 /drivers/firmware/efi/vars.c | |
| parent | efi: mokvar: add missing include of asm/early_ioremap.h (diff) | |
| parent | efi/arm64: libstub: Deal gracefully with EFI_RNG_PROTOCOL failure (diff) | |
| download | linux-4d0a4388ccdd9482fef6b26f879d0f6099143f80.tar.xz linux-4d0a4388ccdd9482fef6b26f879d0f6099143f80.zip | |
Merge branch 'efi/urgent' into efi/core, to pick up fixes
These fixes missed the v5.9 merge window, pick them up for early v5.10 merge.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/efi/vars.c')
| -rw-r--r-- | drivers/firmware/efi/vars.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c index ffb12f6efc97..41c1d00bf933 100644 --- a/drivers/firmware/efi/vars.c +++ b/drivers/firmware/efi/vars.c @@ -403,7 +403,6 @@ static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid, * efivar_init - build the initial list of EFI variables * @func: callback function to invoke for every variable * @data: function-specific data to pass to @func - * @atomic: do we need to execute the @func-loop atomically? * @duplicates: error if we encounter duplicates on @head? * @head: initialised head of variable list * |