From 606cd78d0af42df0c3e8c08c4ad766e5b34ba698 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Jul 2012 10:39:40 -0700
Subject: [PATCH] --- yaml --- r: 311551 b: refs/heads/master c:
 3bfd245476eca2f8375249f3a1e7a60d3c754f47 h: refs/heads/master i:   311549:
 3760a5aa8e5c2a6c7494156f5bd35ff73c959d84   311547:
 cb6c998fc5c2ea524d8e49b64522280abc1b79bb   311543:
 12ccbd619351a0a939ba74dd39c1adcf01d7662a   311535:
 5f1bec57b3365cba0216568da3c1d8bbf3a40a82   311519:
 ac7a7eb3702affa4c76071c875fecd780f94e03d   311487:
 e315e1e226d8444b6c1eb0aa875253332dc2aab8   311423:
 986f016606060b67f6c62073f0b52137ff8c566a   311295:
 de550706fd0d95da2db70795dad6a9a747602e17 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +-
 trunk/arch/powerpc/xmon/xmon.c                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6d5edbc19816..69db29570a42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75331a597cf4cde51d9b0bb22cbd03b9837ef9e4
+refs/heads/master: 3bfd245476eca2f8375249f3a1e7a60d3c754f47
diff --git a/trunk/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/trunk/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index a84aafce2a12..a1044f43becd 100644
--- a/trunk/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/trunk/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -810,7 +810,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_201)
 	lwz	r3,VCORE_NAPPING_THREADS(r5)
 	lwz	r4,VCPU_PTID(r9)
 	li	r0,1
-	sldi	r0,r0,r4
+	sld	r0,r0,r4
 	andc.	r3,r3,r0		/* no sense IPI'ing ourselves */
 	beq	43f
 	mulli	r4,r4,PACA_SIZE		/* get paca for thread 0 */
diff --git a/trunk/arch/powerpc/xmon/xmon.c b/trunk/arch/powerpc/xmon/xmon.c
index 0f3ab06d2222..eab3492a45c5 100644
--- a/trunk/arch/powerpc/xmon/xmon.c
+++ b/trunk/arch/powerpc/xmon/xmon.c
@@ -971,7 +971,7 @@ static int cpu_cmd(void)
 		/* print cpus waiting or in xmon */
 		printf("cpus stopped:");
 		count = 0;
-		for (cpu = 0; cpu < NR_CPUS; ++cpu) {
+		for_each_possible_cpu(cpu) {
 			if (cpumask_test_cpu(cpu, &cpus_in_xmon)) {
 				if (count == 0)
 					printf(" %x", cpu);