diff for duplicates of <1348707699.2443.21.camel@pasglop> diff --git a/a/1.txt b/N1/1.txt index ac91712..7ebd064 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,7 +50,7 @@ Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > +++ b/arch/powerpc/kernel/smp.c > @@ -410,6 +410,45 @@ int generic_check_cpu_restart(unsigned int cpu) > { -> return per_cpu(cpu_state, cpu) = CPU_UP_PREPARE; +> return per_cpu(cpu_state, cpu) == CPU_UP_PREPARE; > } > + > +static atomic_t secondary_inhibit_count; @@ -105,7 +105,7 @@ Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > + cpu % threads_per_core != 0) > + return -EBUSY; > + -> if (smp_ops = NULL || +> if (smp_ops == NULL || > (smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu))) > return -EINVAL; > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c diff --git a/a/content_digest b/N1/content_digest index 6c1cea6..51dd914 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020120921053505.GC15685@drongo\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0Re: [PATCH 02/10] KVM: PPC: Book3S HV: Allow KVM guests to stop secondary threads coming online\0" - "Date\0Thu, 27 Sep 2012 01:01:39 +0000\0" + "Date\0Thu, 27 Sep 2012 11:01:39 +1000\0" "To\0Paul Mackerras <paulus@samba.org>\0" "Cc\0Alexander Graf <agraf@suse.de>" kvm@vger.kernel.org @@ -61,7 +61,7 @@ "> +++ b/arch/powerpc/kernel/smp.c\n" "> @@ -410,6 +410,45 @@ int generic_check_cpu_restart(unsigned int cpu)\n" "> {\n" - "> \treturn per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;\n" + "> \treturn per_cpu(cpu_state, cpu) == CPU_UP_PREPARE;\n" "> }\n" "> +\n" "> +static atomic_t secondary_inhibit_count;\n" @@ -116,7 +116,7 @@ "> +\t cpu % threads_per_core != 0)\n" "> +\t\treturn -EBUSY;\n" "> +\n" - "> \tif (smp_ops = NULL ||\n" + "> \tif (smp_ops == NULL ||\n" "> \t (smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu)))\n" "> \t\treturn -EINVAL;\n" "> diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c\n" @@ -162,4 +162,4 @@ "> \t\tkvm_release_rma(kvm->arch.rma);\n" "> \t\tkvm->arch.rma = NULL;" -c3981ca7a225fc3cc4bb135eb47fcf0a828757a8948e37640c5b04bbd9e41f21 +4a3a03f7af024a21be1183b3f2dfd50e3775c28b5adcc420ac6aca2d596231e7
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.