drop powerpc-kvm-fix-kvm_use_magic_page.patch from everywhere

diff --git a/queue-4.19/powerpc-kvm-fix-kvm_use_magic_page.patch b/queue-4.19/powerpc-kvm-fix-kvm_use_magic_page.patch
deleted file mode 100644 (file)
index 08fbc53..0000000
--- a/queue-4.19/powerpc-kvm-fix-kvm_use_magic_page.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0c8eb2884a42d992c7726539328b7d3568f22143 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Mon, 2 Aug 2021 13:46:19 +0200
-Subject: powerpc/kvm: Fix kvm_use_magic_page
-
-From: Andreas Gruenbacher <agruenba@redhat.com>
-
-commit 0c8eb2884a42d992c7726539328b7d3568f22143 upstream.
-
-When switching from __get_user to fault_in_pages_readable, commit
-9f9eae5ce717 broke kvm_use_magic_page: like __get_user,
-fault_in_pages_readable returns 0 on success.
-
-Fixes: 9f9eae5ce717 ("powerpc/kvm: Prefer fault_in_pages_readable function")
-Cc: stable@vger.kernel.org # v4.18+
-Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/powerpc/kernel/kvm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/powerpc/kernel/kvm.c
-+++ b/arch/powerpc/kernel/kvm.c
-@@ -680,7 +680,7 @@ static void kvm_use_magic_page(void)
-       on_each_cpu(kvm_map_magic_page, &features, 1);
- 
-       /* Quick self-test to see if the mapping works */
--      if (!fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
-+      if (fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
-               kvm_patching_worked = false;
-               return;
-       }

diff --git a/queue-4.19/series b/queue-4.19/series
index 9e7627825032673a396675da2c9bcf2614f9f6ab..9088120f1c71ea22a96906454941d7d98e612a73 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -38,7 +38,6 @@ vmxnet3-do-not-stop-tx-queues-after-netif_device_det.patch
 btrfs-clear-missing-device-status-bit-in-btrfs_close_one_device.patch
 btrfs-fix-lost-error-handling-when-replaying-directory-deletes.patch
 btrfs-call-btrfs_check_rw_degradable-only-if-there-is-a-missing-device.patch
-powerpc-kvm-fix-kvm_use_magic_page.patch
 ia64-kprobes-fix-to-pass-correct-trampoline-address-to-the-handler.patch
 hwmon-pmbus-lm25066-add-offset-coefficients.patch
 regulator-s5m8767-do-not-use-reset-value-as-dvs-voltage-if-gpio-dvs-is-disabled.patch

diff --git a/queue-5.10/powerpc-kvm-fix-kvm_use_magic_page.patch b/queue-5.10/powerpc-kvm-fix-kvm_use_magic_page.patch
deleted file mode 100644 (file)
index 8768988..0000000
--- a/queue-5.10/powerpc-kvm-fix-kvm_use_magic_page.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0c8eb2884a42d992c7726539328b7d3568f22143 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Mon, 2 Aug 2021 13:46:19 +0200
-Subject: powerpc/kvm: Fix kvm_use_magic_page
-
-From: Andreas Gruenbacher <agruenba@redhat.com>
-
-commit 0c8eb2884a42d992c7726539328b7d3568f22143 upstream.
-
-When switching from __get_user to fault_in_pages_readable, commit
-9f9eae5ce717 broke kvm_use_magic_page: like __get_user,
-fault_in_pages_readable returns 0 on success.
-
-Fixes: 9f9eae5ce717 ("powerpc/kvm: Prefer fault_in_pages_readable function")
-Cc: stable@vger.kernel.org # v4.18+
-Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/powerpc/kernel/kvm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/powerpc/kernel/kvm.c
-+++ b/arch/powerpc/kernel/kvm.c
-@@ -669,7 +669,7 @@ static void __init kvm_use_magic_page(vo
-       on_each_cpu(kvm_map_magic_page, &features, 1);
- 
-       /* Quick self-test to see if the mapping works */
--      if (!fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
-+      if (fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
-               kvm_patching_worked = false;
-               return;
-       }

diff --git a/queue-5.10/series b/queue-5.10/series
index c166c66fc518d2a8bb4777dc92c42967d98191f4..fd0de9320c99ed345c068aa5b338036abfed50aa 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -83,7 +83,6 @@ btrfs-clear-missing-device-status-bit-in-btrfs_close_one_device.patch
 btrfs-fix-lost-error-handling-when-replaying-directory-deletes.patch
 btrfs-call-btrfs_check_rw_degradable-only-if-there-is-a-missing-device.patch
 kvm-vmx-unregister-posted-interrupt-wakeup-handler-on-hardware-unsetup.patch
-powerpc-kvm-fix-kvm_use_magic_page.patch
 ia64-kprobes-fix-to-pass-correct-trampoline-address-to-the-handler.patch
 selinux-fix-race-condition-when-computing-ocontext-sids.patch
 hwmon-pmbus-lm25066-add-offset-coefficients.patch

diff --git a/queue-5.14/powerpc-kvm-fix-kvm_use_magic_page.patch b/queue-5.14/powerpc-kvm-fix-kvm_use_magic_page.patch
deleted file mode 100644 (file)
index 8768988..0000000
--- a/queue-5.14/powerpc-kvm-fix-kvm_use_magic_page.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0c8eb2884a42d992c7726539328b7d3568f22143 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Mon, 2 Aug 2021 13:46:19 +0200
-Subject: powerpc/kvm: Fix kvm_use_magic_page
-
-From: Andreas Gruenbacher <agruenba@redhat.com>
-
-commit 0c8eb2884a42d992c7726539328b7d3568f22143 upstream.
-
-When switching from __get_user to fault_in_pages_readable, commit
-9f9eae5ce717 broke kvm_use_magic_page: like __get_user,
-fault_in_pages_readable returns 0 on success.
-
-Fixes: 9f9eae5ce717 ("powerpc/kvm: Prefer fault_in_pages_readable function")
-Cc: stable@vger.kernel.org # v4.18+
-Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/powerpc/kernel/kvm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/powerpc/kernel/kvm.c
-+++ b/arch/powerpc/kernel/kvm.c
-@@ -669,7 +669,7 @@ static void __init kvm_use_magic_page(vo
-       on_each_cpu(kvm_map_magic_page, &features, 1);
- 
-       /* Quick self-test to see if the mapping works */
--      if (!fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
-+      if (fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
-               kvm_patching_worked = false;
-               return;
-       }

diff --git a/queue-5.14/series b/queue-5.14/series
index 3d2ddde5eaff128457905fea63a07eef1a450260..509394a4eca33a2e65d101e37e6aa9407c77dfe5 100644 (file)
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -98,7 +98,6 @@ btrfs-clear-missing-device-status-bit-in-btrfs_close_one_device.patch
 btrfs-fix-lost-error-handling-when-replaying-directory-deletes.patch
 btrfs-call-btrfs_check_rw_degradable-only-if-there-is-a-missing-device.patch
 kvm-vmx-unregister-posted-interrupt-wakeup-handler-on-hardware-unsetup.patch
-powerpc-kvm-fix-kvm_use_magic_page.patch
 kvm-ppc-tick-accounting-should-defer-vtime-accounting-til-after-irq-handling.patch
 ia64-kprobes-fix-to-pass-correct-trampoline-address-to-the-handler.patch
 selinux-fix-race-condition-when-computing-ocontext-sids.patch

diff --git a/queue-5.15/powerpc-kvm-fix-kvm_use_magic_page.patch b/queue-5.15/powerpc-kvm-fix-kvm_use_magic_page.patch
deleted file mode 100644 (file)
index 8768988..0000000
--- a/queue-5.15/powerpc-kvm-fix-kvm_use_magic_page.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0c8eb2884a42d992c7726539328b7d3568f22143 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Mon, 2 Aug 2021 13:46:19 +0200
-Subject: powerpc/kvm: Fix kvm_use_magic_page
-
-From: Andreas Gruenbacher <agruenba@redhat.com>
-
-commit 0c8eb2884a42d992c7726539328b7d3568f22143 upstream.
-
-When switching from __get_user to fault_in_pages_readable, commit
-9f9eae5ce717 broke kvm_use_magic_page: like __get_user,
-fault_in_pages_readable returns 0 on success.
-
-Fixes: 9f9eae5ce717 ("powerpc/kvm: Prefer fault_in_pages_readable function")
-Cc: stable@vger.kernel.org # v4.18+
-Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/powerpc/kernel/kvm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/powerpc/kernel/kvm.c
-+++ b/arch/powerpc/kernel/kvm.c
-@@ -669,7 +669,7 @@ static void __init kvm_use_magic_page(vo
-       on_each_cpu(kvm_map_magic_page, &features, 1);
- 
-       /* Quick self-test to see if the mapping works */
--      if (!fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
-+      if (fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
-               kvm_patching_worked = false;
-               return;
-       }

diff --git a/queue-5.15/series b/queue-5.15/series
index 7c238f2f72821ac9ad2a7b4131a0dc817232045e..6dd0faab257dbbbb5040621e3b8d2b6078731fe9 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -63,7 +63,6 @@ btrfs-fix-lost-error-handling-when-replaying-directory-deletes.patch
 btrfs-call-btrfs_check_rw_degradable-only-if-there-is-a-missing-device.patch
 kvm-x86-mmu-drop-a-redundant-broken-remote-tlb-flush.patch
 kvm-vmx-unregister-posted-interrupt-wakeup-handler-on-hardware-unsetup.patch
-powerpc-kvm-fix-kvm_use_magic_page.patch
 kvm-ppc-tick-accounting-should-defer-vtime-accounting-til-after-irq-handling.patch
 ia64-kprobes-fix-to-pass-correct-trampoline-address-to-the-handler.patch
 selinux-fix-race-condition-when-computing-ocontext-sids.patch

diff --git a/queue-5.4/powerpc-kvm-fix-kvm_use_magic_page.patch b/queue-5.4/powerpc-kvm-fix-kvm_use_magic_page.patch
deleted file mode 100644 (file)
index 8768988..0000000
--- a/queue-5.4/powerpc-kvm-fix-kvm_use_magic_page.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0c8eb2884a42d992c7726539328b7d3568f22143 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Mon, 2 Aug 2021 13:46:19 +0200
-Subject: powerpc/kvm: Fix kvm_use_magic_page
-
-From: Andreas Gruenbacher <agruenba@redhat.com>
-
-commit 0c8eb2884a42d992c7726539328b7d3568f22143 upstream.
-
-When switching from __get_user to fault_in_pages_readable, commit
-9f9eae5ce717 broke kvm_use_magic_page: like __get_user,
-fault_in_pages_readable returns 0 on success.
-
-Fixes: 9f9eae5ce717 ("powerpc/kvm: Prefer fault_in_pages_readable function")
-Cc: stable@vger.kernel.org # v4.18+
-Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/powerpc/kernel/kvm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/powerpc/kernel/kvm.c
-+++ b/arch/powerpc/kernel/kvm.c
-@@ -669,7 +669,7 @@ static void __init kvm_use_magic_page(vo
-       on_each_cpu(kvm_map_magic_page, &features, 1);
- 
-       /* Quick self-test to see if the mapping works */
--      if (!fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
-+      if (fault_in_pages_readable((const char *)KVM_MAGIC_PAGE, sizeof(u32))) {
-               kvm_patching_worked = false;
-               return;
-       }

diff --git a/queue-5.4/series b/queue-5.4/series
index 307a7f77db10e04fcf8f650deb1119ee835fc022..d3fc9a7a7f9e2739743f5bd0ffb72c14ad4de9ac 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -59,7 +59,6 @@ net-smc-correct-spelling-mistake-to-tcpf_syn_recv.patch
 btrfs-clear-missing-device-status-bit-in-btrfs_close_one_device.patch
 btrfs-fix-lost-error-handling-when-replaying-directory-deletes.patch
 btrfs-call-btrfs_check_rw_degradable-only-if-there-is-a-missing-device.patch
-powerpc-kvm-fix-kvm_use_magic_page.patch
 ia64-kprobes-fix-to-pass-correct-trampoline-address-to-the-handler.patch
 hwmon-pmbus-lm25066-add-offset-coefficients.patch
 regulator-s5m8767-do-not-use-reset-value-as-dvs-voltage-if-gpio-dvs-is-disabled.patch