diff for duplicates of <20120921053505.GC15685@drongo> diff --git a/a/1.txt b/N1/1.txt index e6df3c9..7978e19 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,7 +46,7 @@ index 0321007..c45f51d 100644 +++ 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; @@ -101,7 +101,7 @@ index 0321007..c45f51d 100644 + 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 3aacb53..ddf6fe6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020120921051606.GA15685@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" "Subject\0[PATCH 02/10] KVM: PPC: Book3S HV: Allow KVM guests to stop secondary threads coming online\0" - "Date\0Fri, 21 Sep 2012 05:35:05 +0000\0" + "Date\0Fri, 21 Sep 2012 15:35:05 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0kvm@vger.kernel.org" kvm-ppc@vger.kernel.org @@ -56,7 +56,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" @@ -111,7 +111,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" @@ -159,4 +159,4 @@ "-- \n" 1.7.10 -8781ca942f66986365b7c79b1e9b9fb983089de38781243cdcbf5c74446c3fd4 +8c7600f6623010f9120f764b618c399aa30141fef6bacbec72cdb18ac25afea7
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.