diff for duplicates of <20190608114232.8731-36-sashal@kernel.org> diff --git a/a/1.txt b/N1/1.txt index cec3e5e..69d4952 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,7 +71,7 @@ index 2d3b2b1cc272..8f2355138f80 100644 + lockdep_assert_held(&kvm->arch.rtas_token_lock); list_for_each_entry(d, &kvm->arch.rtas_tokens, list) { - if (d->token = token) + if (d->token == token) @@ -206,14 +206,14 @@ int kvm_vm_ioctl_rtas_define_token(struct kvm *kvm, void __user *argp) if (copy_from_user(&args, argp, sizeof(args))) return -EFAULT; @@ -105,7 +105,7 @@ index 2d3b2b1cc272..8f2355138f80 100644 - mutex_unlock(&vcpu->kvm->lock); + mutex_unlock(&vcpu->kvm->arch.rtas_token_lock); - if (rc = 0) { + if (rc == 0) { args.rets = orig_rets; @@ -282,8 +282,6 @@ void kvmppc_rtas_tokens_free(struct kvm *kvm) { diff --git a/a/content_digest b/N1/content_digest index 606c1df..8a4f76a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,12 @@ "ref\020190608114232.8731-1-sashal@kernel.org\0" "From\0Sasha Levin <sashal@kernel.org>\0" "Subject\0[PATCH AUTOSEL 4.19 36/49] KVM: PPC: Book3S: Use new mutex to synchronize access to rtas token list\0" - "Date\0Sat, 08 Jun 2019 11:42:17 +0000\0" + "Date\0Sat, 8 Jun 2019 07:42:17 -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" @@ -83,7 +82,7 @@ "+\tlockdep_assert_held(&kvm->arch.rtas_token_lock);\n" " \n" " \tlist_for_each_entry(d, &kvm->arch.rtas_tokens, list) {\n" - " \t\tif (d->token = token)\n" + " \t\tif (d->token == token)\n" "@@ -206,14 +206,14 @@ int kvm_vm_ioctl_rtas_define_token(struct kvm *kvm, void __user *argp)\n" " \tif (copy_from_user(&args, argp, sizeof(args)))\n" " \t\treturn -EFAULT;\n" @@ -117,7 +116,7 @@ "-\tmutex_unlock(&vcpu->kvm->lock);\n" "+\tmutex_unlock(&vcpu->kvm->arch.rtas_token_lock);\n" " \n" - " \tif (rc = 0) {\n" + " \tif (rc == 0) {\n" " \t\targs.rets = orig_rets;\n" "@@ -282,8 +282,6 @@ void kvmppc_rtas_tokens_free(struct kvm *kvm)\n" " {\n" @@ -131,4 +130,4 @@ "-- \n" 2.20.1 -491ff8e8354a064c71c264b7c74bfb3ff3c74b0e4e360985c2a15a42dff76ece +411cd830b305675d1a4bee14675a33195bfdb331ded4e95c6c497616a0807ca4
diff --git a/a/1.txt b/N2/1.txt index cec3e5e..69d4952 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -71,7 +71,7 @@ index 2d3b2b1cc272..8f2355138f80 100644 + lockdep_assert_held(&kvm->arch.rtas_token_lock); list_for_each_entry(d, &kvm->arch.rtas_tokens, list) { - if (d->token = token) + if (d->token == token) @@ -206,14 +206,14 @@ int kvm_vm_ioctl_rtas_define_token(struct kvm *kvm, void __user *argp) if (copy_from_user(&args, argp, sizeof(args))) return -EFAULT; @@ -105,7 +105,7 @@ index 2d3b2b1cc272..8f2355138f80 100644 - mutex_unlock(&vcpu->kvm->lock); + mutex_unlock(&vcpu->kvm->arch.rtas_token_lock); - if (rc = 0) { + if (rc == 0) { args.rets = orig_rets; @@ -282,8 +282,6 @@ void kvmppc_rtas_tokens_free(struct kvm *kvm) { diff --git a/a/content_digest b/N2/content_digest index 606c1df..78237ab 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020190608114232.8731-1-sashal@kernel.org\0" "From\0Sasha Levin <sashal@kernel.org>\0" "Subject\0[PATCH AUTOSEL 4.19 36/49] KVM: PPC: Book3S: Use new mutex to synchronize access to rtas token list\0" - "Date\0Sat, 08 Jun 2019 11:42:17 +0000\0" + "Date\0Sat, 8 Jun 2019 07:42:17 -0400\0" "To\0linux-kernel@vger.kernel.org" " stable@vger.kernel.org\0" "Cc\0Paul Mackerras <paulus@ozlabs.org>" @@ -83,7 +83,7 @@ "+\tlockdep_assert_held(&kvm->arch.rtas_token_lock);\n" " \n" " \tlist_for_each_entry(d, &kvm->arch.rtas_tokens, list) {\n" - " \t\tif (d->token = token)\n" + " \t\tif (d->token == token)\n" "@@ -206,14 +206,14 @@ int kvm_vm_ioctl_rtas_define_token(struct kvm *kvm, void __user *argp)\n" " \tif (copy_from_user(&args, argp, sizeof(args)))\n" " \t\treturn -EFAULT;\n" @@ -117,7 +117,7 @@ "-\tmutex_unlock(&vcpu->kvm->lock);\n" "+\tmutex_unlock(&vcpu->kvm->arch.rtas_token_lock);\n" " \n" - " \tif (rc = 0) {\n" + " \tif (rc == 0) {\n" " \t\targs.rets = orig_rets;\n" "@@ -282,8 +282,6 @@ void kvmppc_rtas_tokens_free(struct kvm *kvm)\n" " {\n" @@ -131,4 +131,4 @@ "-- \n" 2.20.1 -491ff8e8354a064c71c264b7c74bfb3ff3c74b0e4e360985c2a15a42dff76ece +c5af43ab63bf8ac5cf9da75147ec0f429a80e421500adba2232f9c59da72a31d
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.