diff for duplicates of <20191113015622.11592-55-sashal@kernel.org> diff --git a/a/1.txt b/N1/1.txt index ea3c46e..b11a7b1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,9 +27,9 @@ index d38280b01ef08..1eda812499376 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 491b3b9..7f2c6cb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,13 @@ "ref\020191113015622.11592-1-sashal@kernel.org\0" "From\0Sasha Levin <sashal@kernel.org>\0" - "Subject\0[PATCH AUTOSEL 4.14 055/115] KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and\0" - "Date\0Wed, 13 Nov 2019 01:55:22 +0000\0" + "Subject\0[PATCH AUTOSEL 4.14 055/115] KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR\0" + "Date\0Tue, 12 Nov 2019 20:55:22 -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 -861ea1bff96259bf68669fde58980f426703a8020d4e7e131a3431521e87faac +7d0801959ad819428cd56d8b977308cb3ee684d27143de6962b0008816d887fa
diff --git a/a/1.txt b/N2/1.txt index ea3c46e..b11a7b1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,9 +27,9 @@ index d38280b01ef08..1eda812499376 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 491b3b9..6e72f44 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020191113015622.11592-1-sashal@kernel.org\0" "From\0Sasha Levin <sashal@kernel.org>\0" - "Subject\0[PATCH AUTOSEL 4.14 055/115] KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and\0" - "Date\0Wed, 13 Nov 2019 01:55:22 +0000\0" + "Subject\0[PATCH AUTOSEL 4.14 055/115] KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR\0" + "Date\0Tue, 12 Nov 2019 20:55:22 -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 -861ea1bff96259bf68669fde58980f426703a8020d4e7e131a3431521e87faac +dfa7d01192ff920bef4e16c965130f4e5cbab7bdd54763dced336df85395d761
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.