diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2020-04-01 09:12:24 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2020-04-01 09:12:24 -0400 |
| commit | 0bf9749b455d1fe18a7e6a56ba00efadff057106 (patch) | |
| tree | a082c162b3a889bffb3ce46a6762abe587ad2409 | |
| parent | Linux patch 5.5.14 (diff) | |
| download | linux-patches-0bf9749b455d1fe18a7e6a56ba00efadff057106.tar.gz linux-patches-0bf9749b455d1fe18a7e6a56ba00efadff057106.tar.bz2 linux-patches-0bf9749b455d1fe18a7e6a56ba00efadff057106.zip | |
Remove redundant patch5.5-16
Removed: 1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch | 33 |
2 files changed, 0 insertions, 37 deletions
diff --git a/0000_README b/0000_README index 60b30278..835b96fc 100644 --- a/0000_README +++ b/0000_README @@ -107,10 +107,6 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ Desc: Enable link security restrictions by default. -Patch: 1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch -From: https://lkml.org/lkml/diff/2020/3/18/809/1 -Desc: x86/ioremap: Fix CONFIG_EFI=n build. See bug #713460. Thanks to Phil Stracchino. - Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 diff --git a/1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch b/1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch deleted file mode 100644 index e6bc74f3..00000000 --- a/1800_x86-ioremap-Fix-CONFIG_EFI-equals-n-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Borislav Petkov <bp@suse.de> -Date: Wed, 18 Mar 2020 19:27:48 +0100 - -In order to use efi_mem_type(), one needs CONFIG_EFI enabled. Otherwise -that function is undefined. Use IS_ENABLED() to check and avoid the -ifdeffery as the compiler optimizes away the following unreachable code -then. - -Fixes: 985e537a4082 ("x86/ioremap: Map EFI runtime services data as encrypted for SEV") -Reported-by: Randy Dunlap <rdunlap@infradead.org> -Signed-off-by: Borislav Petkov <bp@suse.de> -Cc: Tom Lendacky <thomas.lendacky@amd.com> -Link: https://lkml.kernel.org/r/7561e981-0d9b-d62c-0ef2-ce6007aff1ab@infradead.org ---- - arch/x86/mm/ioremap.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c -index 935a91e1fd77..18c637c0dc6f 100644 ---- a/arch/x86/mm/ioremap.c -+++ b/arch/x86/mm/ioremap.c -@@ -115,6 +115,9 @@ static void __ioremap_check_other(resource_size_t addr, struct ioremap_desc *des - if (!sev_active()) - return; - -+ if (!IS_ENABLED(CONFIG_EFI)) -+ return; -+ - if (efi_mem_type(addr) == EFI_RUNTIME_SERVICES_DATA) - desc->flags |= IORES_MAP_ENCRYPTED; - } --- -2.21.0 |