diff options
| author | Laura Abbott <labbott@redhat.com> | 2019-03-11 13:35:25 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2019-03-11 13:59:25 -0700 |
| commit | 2d62e0d70f99987e98fedec648a10a286000eab0 (patch) | |
| tree | b7c04f62e6915fe7865db2fafadd0ade3a323981 /efi-secureboot.patch | |
| parent | 4c7c358c38e94d1ccbc1f848e6cb98711fa9284c (diff) | |
| download | kernel-2d62e0d70f99987e98fedec648a10a286000eab0.tar.gz kernel-2d62e0d70f99987e98fedec648a10a286000eab0.tar.xz kernel-2d62e0d70f99987e98fedec648a10a286000eab0.zip | |
Linux v5.0.1 rebase
Diffstat (limited to 'efi-secureboot.patch')
| -rw-r--r-- | efi-secureboot.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/efi-secureboot.patch b/efi-secureboot.patch index 1476abab3..5a3738a22 100644 --- a/efi-secureboot.patch +++ b/efi-secureboot.patch @@ -164,18 +164,18 @@ index 100ce4a4aff6..62361b647a75 100644 #ifdef CONFIG_EFI /* -@@ -1169,6 +1177,8 @@ extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); +@@ -1198,6 +1206,8 @@ static inline bool efi_enabled(int feature) + extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); + extern bool efi_is_table_address(unsigned long phys_addr); - - extern int efi_apply_persistent_mem_reservations(void); + +extern void __init efi_set_secure_boot(enum efi_secureboot_mode mode); #else static inline bool efi_enabled(int feature) { -@@ -1192,6 +1202,8 @@ static inline int efi_apply_persistent_mem_reservations(void) +@@ -1216,6 +1226,8 @@ static inline bool efi_is_table_address(unsigned long phys_addr) { - return 0; + return false; } + +static inline void efi_set_secure_boot(enum efi_secureboot_mode mode) {} @@ -285,8 +285,8 @@ index 461d5acc3616..13fdada1ffc2 100644 + triggered if EFI Secure Boot is set. + - source security/selinux/Kconfig - source security/smack/Kconfig + source "security/selinux/Kconfig" + source "security/smack/Kconfig" diff --git a/security/lock_down.c b/security/lock_down.c index 2c6b00f0c229..527f7e51dc8d 100644 --- a/security/lock_down.c |