From cce64069888d52c5365655bb58dbf4845619c5d3 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 4 Jan 2021 12:38:23 -0600 Subject: Merge fixup for secureboot Signed-off-by: Justin M. Forbes --- secureboot_merge_fix.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 secureboot_merge_fix.patch (limited to 'secureboot_merge_fix.patch') diff --git a/secureboot_merge_fix.patch b/secureboot_merge_fix.patch new file mode 100644 index 000000000..d67a4b7ca --- /dev/null +++ b/secureboot_merge_fix.patch @@ -0,0 +1,18 @@ +diff --git a/include/linux/efi.h b/include/linux/efi.h +index 03cb4259200d..4c55e3aa7e95 100644 +--- a/include/linux/efi.h ++++ b/include/linux/efi.h +@@ -1096,13 +1096,6 @@ static inline bool efi_runtime_disabled(void) { return true; } + extern void efi_call_virt_check_flags(unsigned long flags, const char *call); + extern unsigned long efi_call_virt_save_flags(void); + +-enum efi_secureboot_mode { +- efi_secureboot_mode_unset, +- efi_secureboot_mode_unknown, +- efi_secureboot_mode_disabled, +- efi_secureboot_mode_enabled, +-}; +- + static inline + enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) + { -- cgit