diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-04 22:03:00 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-04 22:03:00 +0100 |
| commit | 87da4064701f9ed70e8c25b5ee9165450b1d0c40 (patch) | |
| tree | 45a6d6bd73ec6910d0d784091e471915beed0723 /secureboot_merge_fix.patch | |
| parent | d656fcc48d8b13a41be16c7ec477c1f9a0c0d806 (diff) | |
| parent | 51aa5c5b1d358b0ca3334ad97ab57570830d324c (diff) | |
| download | kernel-87da4064701f9ed70e8c25b5ee9165450b1d0c40.tar.gz kernel-87da4064701f9ed70e8c25b5ee9165450b1d0c40.tar.xz kernel-87da4064701f9ed70e8c25b5ee9165450b1d0c40.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc2.114.vanilla.1.fc33kernel-5.11.0-0.rc2.114.vanilla.1.fc32
Diffstat (limited to 'secureboot_merge_fix.patch')
| -rw-r--r-- | secureboot_merge_fix.patch | 18 |
1 files changed, 18 insertions, 0 deletions
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) + { |