From ad68a91945c2098ab25e50431acf03605c0a05bf Mon Sep 17 00:00:00 2001
From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Wed, 5 Nov 2008 09:36:24 -0600
Subject: [PATCH] --- yaml --- r: 125219 b: refs/heads/master c:
 fcfdbd266a41d3e41d17666de410a24995fde03a h: refs/heads/master i:   125217:
 e7a0fc781febc38b4754bf9067b4a0f541f0da38   125215:
 0384f61d3c9b014dae671a9ca100c3db88095ec5 v: v3

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

diff --git a/[refs] b/[refs]
index 0eb206a5f230..109ee150cb9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4cf3892e50b8e35341086a4fe2bb8a3989b55d4
+refs/heads/master: fcfdbd266a41d3e41d17666de410a24995fde03a
diff --git a/trunk/arch/powerpc/kvm/emulate.c b/trunk/arch/powerpc/kvm/emulate.c
index 814f1e687857..4c30fa0c31ea 100644
--- a/trunk/arch/powerpc/kvm/emulate.c
+++ b/trunk/arch/powerpc/kvm/emulate.c
@@ -74,8 +74,8 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 	int advance = 1;
 
 	switch (get_op(inst)) {
-	case 3:                                                 /* trap */
-		printk("trap!\n");
+	case 3:                                             /* trap */
+		vcpu->arch.esr |= ESR_PTR;
 		kvmppc_core_queue_program(vcpu);
 		advance = 0;
 		break;