Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull a couple more powerpc fixes from Benjamin Herrenschmidt: "Here are two more fixes that I "missed" when scrubbing patchwork last week which are worth still having in 3.5." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/kvm: sldi should be sld powerpc/xmon: Use cpumask iterator to avoid warning
This commit is contained in:
commit
9d4056aa9e
|
@ -810,7 +810,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_201)
|
||||||
lwz r3,VCORE_NAPPING_THREADS(r5)
|
lwz r3,VCORE_NAPPING_THREADS(r5)
|
||||||
lwz r4,VCPU_PTID(r9)
|
lwz r4,VCPU_PTID(r9)
|
||||||
li r0,1
|
li r0,1
|
||||||
sldi r0,r0,r4
|
sld r0,r0,r4
|
||||||
andc. r3,r3,r0 /* no sense IPI'ing ourselves */
|
andc. r3,r3,r0 /* no sense IPI'ing ourselves */
|
||||||
beq 43f
|
beq 43f
|
||||||
mulli r4,r4,PACA_SIZE /* get paca for thread 0 */
|
mulli r4,r4,PACA_SIZE /* get paca for thread 0 */
|
||||||
|
|
|
@ -971,7 +971,7 @@ static int cpu_cmd(void)
|
||||||
/* print cpus waiting or in xmon */
|
/* print cpus waiting or in xmon */
|
||||||
printf("cpus stopped:");
|
printf("cpus stopped:");
|
||||||
count = 0;
|
count = 0;
|
||||||
for (cpu = 0; cpu < NR_CPUS; ++cpu) {
|
for_each_possible_cpu(cpu) {
|
||||||
if (cpumask_test_cpu(cpu, &cpus_in_xmon)) {
|
if (cpumask_test_cpu(cpu, &cpus_in_xmon)) {
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
printf(" %x", cpu);
|
printf(" %x", cpu);
|
||||||
|
|
Loading…
Reference in New Issue