diff for duplicates of <20191113015932.12655-29-sashal@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 5a0ef80..9a741dc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,9 +27,9 @@ index 73c3c127d8584..209cad89a11a5 100644 if (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) { ulong pc = kvmppc_get_pc(vcpu); + ulong lr = kvmppc_get_lr(vcpu); - if ((pc & SPLIT_HACK_MASK) = SPLIT_HACK_OFFS) + if ((pc & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS) kvmppc_set_pc(vcpu, pc & ~SPLIT_HACK_MASK); -+ if ((lr & SPLIT_HACK_MASK) = SPLIT_HACK_OFFS) ++ if ((lr & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS) + kvmppc_set_lr(vcpu, lr & ~SPLIT_HACK_MASK); vcpu->arch.hflags &= ~BOOK3S_HFLAG_SPLIT_HACK; } diff --git a/a/content_digest b/N1/content_digest index f090706..04717fc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,13 @@ "ref\020191113015932.12655-1-sashal@kernel.org\0" "From\0Sasha Levin <sashal@kernel.org>\0" "Subject\0[PATCH AUTOSEL 4.9 29/68] KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR\0" - "Date\0Wed, 13 Nov 2019 01:58:53 +0000\0" + "Date\0Tue, 12 Nov 2019 20:58:53 -0500\0" "To\0linux-kernel@vger.kernel.org" " stable@vger.kernel.org\0" - "Cc\0Cameron Kaiser <spectre@floodgap.com>" - Paul 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 + Cameron Kaiser <spectre@floodgap.com> + " kvm-ppc@vger.kernel.org\0" "\00:1\0" "b\0" "From: Cameron Kaiser <spectre@floodgap.com>\n" @@ -40,9 +39,9 @@ " \tif (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) {\n" " \t\tulong pc = kvmppc_get_pc(vcpu);\n" "+\t\tulong lr = kvmppc_get_lr(vcpu);\n" - " \t\tif ((pc & SPLIT_HACK_MASK) = SPLIT_HACK_OFFS)\n" + " \t\tif ((pc & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS)\n" " \t\t\tkvmppc_set_pc(vcpu, pc & ~SPLIT_HACK_MASK);\n" - "+\t\tif ((lr & SPLIT_HACK_MASK) = SPLIT_HACK_OFFS)\n" + "+\t\tif ((lr & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS)\n" "+\t\t\tkvmppc_set_lr(vcpu, lr & ~SPLIT_HACK_MASK);\n" " \t\tvcpu->arch.hflags &= ~BOOK3S_HFLAG_SPLIT_HACK;\n" " \t}\n" @@ -50,4 +49,4 @@ "-- \n" 2.20.1 -7363de018d23082785ec8323f0c5f7061bfc8d10905611f7870a12c02a5e98fc +5259df2ebf06db420e8351b496615eac969931fb4b19a41f068c89c464398f8a
diff --git a/a/1.txt b/N2/1.txt index 5a0ef80..9a741dc 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,9 +27,9 @@ index 73c3c127d8584..209cad89a11a5 100644 if (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) { ulong pc = kvmppc_get_pc(vcpu); + ulong lr = kvmppc_get_lr(vcpu); - if ((pc & SPLIT_HACK_MASK) = SPLIT_HACK_OFFS) + if ((pc & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS) kvmppc_set_pc(vcpu, pc & ~SPLIT_HACK_MASK); -+ if ((lr & SPLIT_HACK_MASK) = SPLIT_HACK_OFFS) ++ if ((lr & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS) + kvmppc_set_lr(vcpu, lr & ~SPLIT_HACK_MASK); vcpu->arch.hflags &= ~BOOK3S_HFLAG_SPLIT_HACK; } diff --git a/a/content_digest b/N2/content_digest index f090706..88078ac 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020191113015932.12655-1-sashal@kernel.org\0" "From\0Sasha Levin <sashal@kernel.org>\0" "Subject\0[PATCH AUTOSEL 4.9 29/68] KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR\0" - "Date\0Wed, 13 Nov 2019 01:58:53 +0000\0" + "Date\0Tue, 12 Nov 2019 20:58:53 -0500\0" "To\0linux-kernel@vger.kernel.org" " stable@vger.kernel.org\0" "Cc\0Cameron Kaiser <spectre@floodgap.com>" @@ -40,9 +40,9 @@ " \tif (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) {\n" " \t\tulong pc = kvmppc_get_pc(vcpu);\n" "+\t\tulong lr = kvmppc_get_lr(vcpu);\n" - " \t\tif ((pc & SPLIT_HACK_MASK) = SPLIT_HACK_OFFS)\n" + " \t\tif ((pc & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS)\n" " \t\t\tkvmppc_set_pc(vcpu, pc & ~SPLIT_HACK_MASK);\n" - "+\t\tif ((lr & SPLIT_HACK_MASK) = SPLIT_HACK_OFFS)\n" + "+\t\tif ((lr & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS)\n" "+\t\t\tkvmppc_set_lr(vcpu, lr & ~SPLIT_HACK_MASK);\n" " \t\tvcpu->arch.hflags &= ~BOOK3S_HFLAG_SPLIT_HACK;\n" " \t}\n" @@ -50,4 +50,4 @@ "-- \n" 2.20.1 -7363de018d23082785ec8323f0c5f7061bfc8d10905611f7870a12c02a5e98fc +d93a96137e9a196231873842ec1200b5f30047d1db700a48daf6e989b4f27970
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.