Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-10-31 12:36:54 +0100
committerMichal Suchanek <msuchanek@suse.de>2018-10-31 23:28:39 +0100
commit6d553d92b583a2a5dda3081daf4c077294a7e378 (patch)
tree2b86e7f873b2dbd6d59a33b693d510ff0d1612b6
parent531bdaf1b9001a5005ddda1a0e453dc52ae07f51 (diff)
KVM: PPC: Book3S HV: Fix inaccurate comment (bsc#1061840).
-rw-r--r--patches.arch/KVM-PPC-Book3S-HV-Fix-inaccurate-comment.patch35
-rw-r--r--series.conf1
2 files changed, 36 insertions, 0 deletions
diff --git a/patches.arch/KVM-PPC-Book3S-HV-Fix-inaccurate-comment.patch b/patches.arch/KVM-PPC-Book3S-HV-Fix-inaccurate-comment.patch
new file mode 100644
index 0000000000..9265d9a8c0
--- /dev/null
+++ b/patches.arch/KVM-PPC-Book3S-HV-Fix-inaccurate-comment.patch
@@ -0,0 +1,35 @@
+From 48e70b1ce667dc032f9166cc00ddb594ecc0065e Mon Sep 17 00:00:00 2001
+From: Paul Mackerras <paulus@ozlabs.org>
+Date: Thu, 19 Apr 2018 11:49:51 +1000
+Subject: [PATCH] KVM: PPC: Book3S HV: Fix inaccurate comment
+
+References: bsc#1061840
+Patch-mainline: v4.18-rc1
+Git-commit: 48e70b1ce667dc032f9166cc00ddb594ecc0065e
+
+We now have interrupts hard-disabled when coming back from
+kvmppc_hv_entry_trampoline, so this changes the comment to reflect
+that.
+
+Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
+Acked-by: Michal Suchanek <msuchanek@suse.de>
+---
+ arch/powerpc/kvm/book3s_hv_interrupts.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/powerpc/kvm/book3s_hv_interrupts.S b/arch/powerpc/kvm/book3s_hv_interrupts.S
+index 0e8493033288..82f2ff9410b6 100644
+--- a/arch/powerpc/kvm/book3s_hv_interrupts.S
++++ b/arch/powerpc/kvm/book3s_hv_interrupts.S
+@@ -137,7 +137,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
+ /*
+ * We return here in virtual mode after the guest exits
+ * with something that we can't handle in real mode.
+- * Interrupts are enabled again at this point.
++ * Interrupts are still hard-disabled.
+ */
+
+ /*
+--
+2.13.7
+
diff --git a/series.conf b/series.conf
index 81afde53ab..6d4a3a4bf2 100644
--- a/series.conf
+++ b/series.conf
@@ -16720,6 +16720,7 @@
patches.fixes/vhost-fix-info-leak-due-to-uninitialized-memory.patch
patches.arch/KVM-PPC-Book3S-HV-Add-online-register-to-ONE_REG-int.patch
patches.arch/KVM-PPC-Book3S-HV-Set-RWMR-on-POWER8-so-PURR-SPURR-c.patch
+ patches.arch/KVM-PPC-Book3S-HV-Fix-inaccurate-comment.patch
patches.suse/ipv6-allow-PMTU-exceptions-to-local-routes.patch
patches.suse/net-dsa-add-error-handling-for-pskb_trim_rcsum.patch
patches.drivers/ixgbe-Fix-setting-of-TC-configuration-for-macvlan-ca.patch