diff for duplicates of <20190608113950.8033-52-sashal@kernel.org> diff --git a/a/1.txt b/N1/1.txt index e633200..c26f512 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -96,7 +96,7 @@ index be7bc070eae5..c1ced22455f9 100644 + mutex_lock(&kvm->arch.mmu_setup_lock); /* Request is still current? */ - if (kvm->arch.resize_hpt = resize) { + if (kvm->arch.resize_hpt == resize) { /* We may request large allocations here: - * do not sleep with kvm->lock held for a while. + * do not sleep with kvm->arch.mmu_setup_lock held for a while. @@ -107,7 +107,7 @@ index be7bc070eae5..c1ced22455f9 100644 resize_hpt_debug(resize, "resize_hpt_prepare_work(): order = %d\n", resize->order); @@ -1494,9 +1494,9 @@ static void resize_hpt_prepare_work(struct work_struct *work) - if (WARN_ON(err = -EBUSY)) + if (WARN_ON(err == -EBUSY)) err = -EINPROGRESS; - mutex_lock(&kvm->lock); diff --git a/a/content_digest b/N1/content_digest index e918703..55c6c04 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,12 @@ "ref\020190608113950.8033-1-sashal@kernel.org\0" "From\0Sasha Levin <sashal@kernel.org>\0" "Subject\0[PATCH AUTOSEL 5.1 52/70] KVM: PPC: Book3S HV: Use new mutex to synchronize MMU setup\0" - "Date\0Sat, 08 Jun 2019 11:39:31 +0000\0" + "Date\0Sat, 8 Jun 2019 07:39:31 -0400\0" "To\0linux-kernel@vger.kernel.org" " stable@vger.kernel.org\0" - "Cc\0Paul Mackerras <paulus@ozlabs.org>" - Sasha Levin <sashal@kernel.org> - kvm-ppc@vger.kernel.org - " linuxppc-dev@lists.ozlabs.org\0" + "Cc\0Sasha Levin <sashal@kernel.org>" + linuxppc-dev@lists.ozlabs.org + " kvm-ppc@vger.kernel.org\0" "\00:1\0" "b\0" "From: Paul Mackerras <paulus@ozlabs.org>\n" @@ -108,7 +107,7 @@ "+\tmutex_lock(&kvm->arch.mmu_setup_lock);\n" " \n" " \t/* Request is still current? */\n" - " \tif (kvm->arch.resize_hpt = resize) {\n" + " \tif (kvm->arch.resize_hpt == resize) {\n" " \t\t/* We may request large allocations here:\n" "-\t\t * do not sleep with kvm->lock held for a while.\n" "+\t\t * do not sleep with kvm->arch.mmu_setup_lock held for a while.\n" @@ -119,7 +118,7 @@ " \t\tresize_hpt_debug(resize, \"resize_hpt_prepare_work(): order = %d\\n\",\n" " \t\t\t\t resize->order);\n" "@@ -1494,9 +1494,9 @@ static void resize_hpt_prepare_work(struct work_struct *work)\n" - " \t\tif (WARN_ON(err = -EBUSY))\n" + " \t\tif (WARN_ON(err == -EBUSY))\n" " \t\t\terr = -EINPROGRESS;\n" " \n" "-\t\tmutex_lock(&kvm->lock);\n" @@ -315,4 +314,4 @@ "-- \n" 2.20.1 -052364139dadd22de93549b09e555961275335fc6487df117ef9bcdf2c938516 +ba44a4adfe5994be6a17013058295bd9676a35107a5ecdd0b6a9fbff3c3ee00b
diff --git a/a/1.txt b/N2/1.txt index e633200..c26f512 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -96,7 +96,7 @@ index be7bc070eae5..c1ced22455f9 100644 + mutex_lock(&kvm->arch.mmu_setup_lock); /* Request is still current? */ - if (kvm->arch.resize_hpt = resize) { + if (kvm->arch.resize_hpt == resize) { /* We may request large allocations here: - * do not sleep with kvm->lock held for a while. + * do not sleep with kvm->arch.mmu_setup_lock held for a while. @@ -107,7 +107,7 @@ index be7bc070eae5..c1ced22455f9 100644 resize_hpt_debug(resize, "resize_hpt_prepare_work(): order = %d\n", resize->order); @@ -1494,9 +1494,9 @@ static void resize_hpt_prepare_work(struct work_struct *work) - if (WARN_ON(err = -EBUSY)) + if (WARN_ON(err == -EBUSY)) err = -EINPROGRESS; - mutex_lock(&kvm->lock); diff --git a/a/content_digest b/N2/content_digest index e918703..257d656 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020190608113950.8033-1-sashal@kernel.org\0" "From\0Sasha Levin <sashal@kernel.org>\0" "Subject\0[PATCH AUTOSEL 5.1 52/70] KVM: PPC: Book3S HV: Use new mutex to synchronize MMU setup\0" - "Date\0Sat, 08 Jun 2019 11:39:31 +0000\0" + "Date\0Sat, 8 Jun 2019 07:39:31 -0400\0" "To\0linux-kernel@vger.kernel.org" " stable@vger.kernel.org\0" "Cc\0Paul Mackerras <paulus@ozlabs.org>" @@ -108,7 +108,7 @@ "+\tmutex_lock(&kvm->arch.mmu_setup_lock);\n" " \n" " \t/* Request is still current? */\n" - " \tif (kvm->arch.resize_hpt = resize) {\n" + " \tif (kvm->arch.resize_hpt == resize) {\n" " \t\t/* We may request large allocations here:\n" "-\t\t * do not sleep with kvm->lock held for a while.\n" "+\t\t * do not sleep with kvm->arch.mmu_setup_lock held for a while.\n" @@ -119,7 +119,7 @@ " \t\tresize_hpt_debug(resize, \"resize_hpt_prepare_work(): order = %d\\n\",\n" " \t\t\t\t resize->order);\n" "@@ -1494,9 +1494,9 @@ static void resize_hpt_prepare_work(struct work_struct *work)\n" - " \t\tif (WARN_ON(err = -EBUSY))\n" + " \t\tif (WARN_ON(err == -EBUSY))\n" " \t\t\terr = -EINPROGRESS;\n" " \n" "-\t\tmutex_lock(&kvm->lock);\n" @@ -315,4 +315,4 @@ "-- \n" 2.20.1 -052364139dadd22de93549b09e555961275335fc6487df117ef9bcdf2c938516 +e92a21726e41ddfb0c5f715ef402dc86757e9d63a627aafd047a770723b0cb2d
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.