Merge fixup for secureboot

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2021-01-04 12:38:23 -06:00
parent a7f5e8cd7c
commit cce6406988
2 changed files with 20 additions and 0 deletions

View File

@ -741,6 +741,7 @@ Source4000: README.rst
%if !%{nopatches} %if !%{nopatches}
Patch1: patch-%{rpmversion}-redhat.patch Patch1: patch-%{rpmversion}-redhat.patch
Patch2: secureboot_merge_fix.patch
%endif %endif
# empty final patch to facilitate testing of kernel patches # empty final patch to facilitate testing of kernel patches
@ -1244,6 +1245,7 @@ cp -a %{SOURCE1} .
%if !%{nopatches} %if !%{nopatches}
ApplyOptionalPatch patch-%{rpmversion}-redhat.patch ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
ApplyOptionalPatch secureboot_merge_fix.patch
%endif %endif
ApplyOptionalPatch linux-kernel-test.patch ApplyOptionalPatch linux-kernel-test.patch

View File

@ -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)
{