summaryrefslogtreecommitdiffstats
path: root/secureboot_merge_fix.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-01-04 12:38:23 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-01-04 12:38:23 -0600
commitcce64069888d52c5365655bb58dbf4845619c5d3 (patch)
treeba377b8cf7dd7ffa87ad05dbb56fcacb0f99263b /secureboot_merge_fix.patch
parenta7f5e8cd7c841fb737893128d30ccc29d52cf4e2 (diff)
downloadkernel-cce64069888d52c5365655bb58dbf4845619c5d3.tar.gz
kernel-cce64069888d52c5365655bb58dbf4845619c5d3.tar.xz
kernel-cce64069888d52c5365655bb58dbf4845619c5d3.zip
Merge fixup for secureboot
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'secureboot_merge_fix.patch')
-rw-r--r--secureboot_merge_fix.patch18
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)
+ {