From ecb1643636b234b37270a9928bcb1cef9d1c2ecc Mon Sep 17 00:00:00 2001
From: Deng-Cheng Zhu <dengcheng.zhu@gmail.com>
Date: Fri, 21 Jan 2011 16:19:17 +0800
Subject: [PATCH] --- yaml --- r: 234151 b: refs/heads/master c:
 91f017372a48d2d128d08964bcfeafbd98b6d739 h: refs/heads/master i:   234149:
 f7458a4d747f9759bfce86dd51814bd9e08c9da9   234147:
 98a47018a65864e01b17499b089564cf32faee1a   234143:
 292e67dc45ef43003cdab2c4bda640fcbda8a143 v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/mips/Kconfig                    |  1 +
 trunk/arch/mips/include/asm/perf_event.h   | 12 +-----------
 trunk/arch/mips/kernel/perf_event_mipsxx.c |  2 +-
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 2b78d3a51270..1c162c9b002f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efe8dc556cd0f22e04c453188ffbc408b492eb82
+refs/heads/master: 91f017372a48d2d128d08964bcfeafbd98b6d739
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index 972695e359eb..bd7b64d252dc 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -4,6 +4,7 @@ config MIPS
 	select HAVE_GENERIC_DMA_COHERENT
 	select HAVE_IDE
 	select HAVE_OPROFILE
+	select HAVE_IRQ_WORK
 	select HAVE_PERF_EVENTS
 	select PERF_USE_VMALLOC
 	select HAVE_ARCH_KGDB
diff --git a/trunk/arch/mips/include/asm/perf_event.h b/trunk/arch/mips/include/asm/perf_event.h
index e00007cf8162..d0c77496c728 100644
--- a/trunk/arch/mips/include/asm/perf_event.h
+++ b/trunk/arch/mips/include/asm/perf_event.h
@@ -11,15 +11,5 @@
 
 #ifndef __MIPS_PERF_EVENT_H__
 #define __MIPS_PERF_EVENT_H__
-
-/*
- * MIPS performance counters do not raise NMI upon overflow, a regular
- * interrupt will be signaled. Hence we can do the pending perf event
- * work at the tail of the irq handler.
- */
-static inline void
-set_perf_event_pending(void)
-{
-}
-
+/* Leave it empty here. The file is required by linux/perf_event.h */
 #endif /* __MIPS_PERF_EVENT_H__ */
diff --git a/trunk/arch/mips/kernel/perf_event_mipsxx.c b/trunk/arch/mips/kernel/perf_event_mipsxx.c
index 183e0d226669..d45ea37062bc 100644
--- a/trunk/arch/mips/kernel/perf_event_mipsxx.c
+++ b/trunk/arch/mips/kernel/perf_event_mipsxx.c
@@ -696,7 +696,7 @@ static int mipsxx_pmu_handle_shared_irq(void)
 	 * interrupt, not NMI.
 	 */
 	if (handled == IRQ_HANDLED)
-		perf_event_do_pending();
+		irq_work_run();
 
 #ifdef CONFIG_MIPS_MT_SMP
 	read_unlock(&pmuint_rwlock);