diff for duplicates of <20200319035609.158654-15-aneesh.kumar@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index fc4224b..cc5ee2e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,7 @@ index fbabdcf24c86..7f19192a8185 100644 kvm->mm->pgd, false, pte_idx_ret); - rcu_read_unlock_sched(); + preempt_enable(); - if (ret = H_TOO_HARD) { + if (ret == H_TOO_HARD) { /* this can't happen */ pr_err("KVM: Oops, kvmppc_h_enter returned too hard!\n"); diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c diff --git a/a/content_digest b/N1/content_digest index a1d6be4..d7c0af0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,16 @@ "ref\020200319035609.158654-1-aneesh.kumar@linux.ibm.com\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>\0" "Subject\0[PATCH v2 14/22] powerpc/kvm/book3s: Use find_kvm_host_pte in h_enter\0" - "Date\0Thu, 19 Mar 2020 03:57:51 +0000\0" + "Date\0Thu, 19 Mar 2020 09:26:01 +0530\0" "To\0linuxppc-dev@lists.ozlabs.org" mpe@ellerman.id.au linux-mm@kvack.org linux-kernel@vger.kernel.org " kvm-ppc@vger.kernel.org\0" - "Cc\0npiggin@gmail.com" - paulus@ozlabs.org - leonardo@linux.ibm.com - kirill@shutemov.name - " Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>\0" + "Cc\0leonardo@linux.ibm.com" + Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> + npiggin@gmail.com + " kirill@shutemov.name\0" "\00:1\0" "b\0" "Since kvmppc_do_h_enter can get called in realmode use low level\n" @@ -38,7 +37,7 @@ " \t\t\t\tkvm->mm->pgd, false, pte_idx_ret);\n" "-\trcu_read_unlock_sched();\n" "+\tpreempt_enable();\n" - " \tif (ret = H_TOO_HARD) {\n" + " \tif (ret == H_TOO_HARD) {\n" " \t\t/* this can't happen */\n" " \t\tpr_err(\"KVM: Oops, kvmppc_h_enter returned too hard!\\n\");\n" "diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c\n" @@ -98,4 +97,4 @@ "-- \n" 2.24.1 -db150d4175f33c48e09a083efedd04a43d6fe1698f5613893b7413404d304c54 +06f28878082924f32ed426a5a41e7904ef38b695a25864c6f43700c870492480
diff --git a/a/1.txt b/N2/1.txt index fc4224b..cc5ee2e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -22,7 +22,7 @@ index fbabdcf24c86..7f19192a8185 100644 kvm->mm->pgd, false, pte_idx_ret); - rcu_read_unlock_sched(); + preempt_enable(); - if (ret = H_TOO_HARD) { + if (ret == H_TOO_HARD) { /* this can't happen */ pr_err("KVM: Oops, kvmppc_h_enter returned too hard!\n"); diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c diff --git a/a/content_digest b/N2/content_digest index a1d6be4..02b4f7c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020200319035609.158654-1-aneesh.kumar@linux.ibm.com\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>\0" "Subject\0[PATCH v2 14/22] powerpc/kvm/book3s: Use find_kvm_host_pte in h_enter\0" - "Date\0Thu, 19 Mar 2020 03:57:51 +0000\0" + "Date\0Thu, 19 Mar 2020 09:26:01 +0530\0" "To\0linuxppc-dev@lists.ozlabs.org" mpe@ellerman.id.au linux-mm@kvack.org @@ -38,7 +38,7 @@ " \t\t\t\tkvm->mm->pgd, false, pte_idx_ret);\n" "-\trcu_read_unlock_sched();\n" "+\tpreempt_enable();\n" - " \tif (ret = H_TOO_HARD) {\n" + " \tif (ret == H_TOO_HARD) {\n" " \t\t/* this can't happen */\n" " \t\tpr_err(\"KVM: Oops, kvmppc_h_enter returned too hard!\\n\");\n" "diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c\n" @@ -98,4 +98,4 @@ "-- \n" 2.24.1 -db150d4175f33c48e09a083efedd04a43d6fe1698f5613893b7413404d304c54 +02ded2e76fdb509e81fe80623ae39b0f146f855d826083f93bfd9361acbc1e61
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.