From 979a2cc195e63b87c31cc0db219575b12bf8d55a Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 22 Feb 2012 16:26:34 +0100
Subject: [PATCH] --- yaml --- r: 307840 b: refs/heads/master c:
 7cc1e8ee78f469ecff8aa29465325f1e4c5e1b5f h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/powerpc/include/asm/hw_irq.h | 1 +
 trunk/arch/powerpc/kvm/booke.c          | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 42a11fbfb324..f23ae7c0196c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e642ccbd6a3f1410155c7700f54b56b6c7df9a2
+refs/heads/master: 7cc1e8ee78f469ecff8aa29465325f1e4c5e1b5f
diff --git a/trunk/arch/powerpc/include/asm/hw_irq.h b/trunk/arch/powerpc/include/asm/hw_irq.h
index 51010bfc792e..c9aac24b02e2 100644
--- a/trunk/arch/powerpc/include/asm/hw_irq.h
+++ b/trunk/arch/powerpc/include/asm/hw_irq.h
@@ -33,6 +33,7 @@
 extern void __replay_interrupt(unsigned int vector);
 
 extern void timer_interrupt(struct pt_regs *);
+extern void performance_monitor_exception(struct pt_regs *regs);
 
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
diff --git a/trunk/arch/powerpc/kvm/booke.c b/trunk/arch/powerpc/kvm/booke.c
index 488936bece69..8e8aa4cb5968 100644
--- a/trunk/arch/powerpc/kvm/booke.c
+++ b/trunk/arch/powerpc/kvm/booke.c
@@ -634,6 +634,10 @@ static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
 	case BOOKE_INTERRUPT_MACHINE_CHECK:
 		/* FIXME */
 		break;
+	case BOOKE_INTERRUPT_PERFORMANCE_MONITOR:
+		kvmppc_fill_pt_regs(&regs);
+		performance_monitor_exception(&regs);
+		break;
 	}
 }