Linux v5.0 rebase
This commit is contained in:
parent
f1deb73151
commit
1ec9f8fe13
645 changed files with 2134 additions and 4234 deletions
|
|
@ -164,16 +164,16 @@ 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 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 bool efi_is_table_address(unsigned long phys_addr)
|
||||
@@ -1216,6 +1226,8 @@ static inline bool efi_is_table_address(unsigned long phys_addr)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue