From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 4 Sep 2018 17:25:19 +0000 (+0200)
Subject: drop x86 patch that shouldn't have been in 4.18
X-Git-Tag: v3.18.121~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e5b435ef9135594c00a33b9e3241c7f702758b1;p=thirdparty%2Fkernel%2Fstable-queue.git

drop x86 patch that shouldn't have been in 4.18
---

diff --git a/queue-4.18/series b/queue-4.18/series
index 8465cf6d79c..8dec035d763 100644
--- a/queue-4.18/series
+++ b/queue-4.18/series
@@ -121,4 +121,3 @@ watchdog-mark-watchdog-touch-functions-as-notrace.patch
 cdrom-fix-info-leak-oob-read-in-cdrom_ioctl_drive_status.patch
 x86-dumpstack-don-t-dump-kernel-memory-based-on-usermode-rip.patch
 mm-move-tlb_table_flush-to-tlb_flush_mmu_free.patch
-x86-kvm-avoid-unused-variable-warning.patch
diff --git a/queue-4.18/x86-kvm-avoid-unused-variable-warning.patch b/queue-4.18/x86-kvm-avoid-unused-variable-warning.patch
deleted file mode 100644
index 805df375322..00000000000
--- a/queue-4.18/x86-kvm-avoid-unused-variable-warning.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 7288bde1f9df6c1475675419bdd7725ce84dec56 Mon Sep 17 00:00:00 2001
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Mon, 20 Aug 2018 23:37:50 +0200
-Subject: x86: kvm: avoid unused variable warning
-
-From: Arnd Bergmann <arnd@arndb.de>
-
-commit 7288bde1f9df6c1475675419bdd7725ce84dec56 upstream.
-
-Removing one of the two accesses of the maxphyaddr variable led to
-a harmless warning:
-
-arch/x86/kvm/x86.c: In function 'kvm_set_mmio_spte_mask':
-arch/x86/kvm/x86.c:6563:6: error: unused variable 'maxphyaddr' [-Werror=unused-variable]
-
-Removing the #ifdef seems to be the nicest workaround, as it
-makes the code look cleaner than adding another #ifdef.
-
-Fixes: 28a1f3ac1d0c ("kvm: x86: Set highest physical address bits in non-present/reserved SPTEs")
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Cc: stable@vger.kernel.org # L1TF
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/x86/kvm/x86.c |    4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -6512,14 +6512,12 @@ static void kvm_set_mmio_spte_mask(void)
- 	/* Set the present bit. */
- 	mask |= 1ull;
- 
--#ifdef CONFIG_X86_64
- 	/*
- 	 * If reserved bit is not supported, clear the present bit to disable
- 	 * mmio page fault.
- 	 */
--	if (maxphyaddr == 52)
-+	if (IS_ENABLED(CONFIG_X86_64) && maxphyaddr == 52)
- 		mask &= ~1ull;
--#endif
- 
- 	kvm_mmu_set_mmio_spte_mask(mask, mask);
- }