1 files changed, 22 insertions, 5 deletions

diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index 789d846a9184..a6bc431cde70 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -16,6 +16,8 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/uaccess.h>
+#include <linux/irq.h>
+#include <linux/irqdesc.h>
 
 #include <asm/irq_regs.h>
 #include <asm/pmu.h>
@@ -205,6 +207,8 @@ armpmu_del(struct perf_event *event, int flags)
         armpmu_stop(event, PERF_EF_UPDATE);
         hw_events->events[idx] = NULL;
         clear_bit(idx, hw_events->used_mask);
+        if (armpmu->clear_event_idx)
+                armpmu->clear_event_idx(hw_events, event);
 
         perf_event_update_userpage(event);
 }
@@ -295,14 +299,27 @@ validate_group(struct perf_event *event)
 
 static irqreturn_t armpmu_dispatch_irq(int irq, void *dev)
 {
-        struct arm_pmu *armpmu = (struct arm_pmu *) dev;
-        struct platform_device *plat_device = armpmu->plat_device;
-        struct arm_pmu_platdata *plat = dev_get_platdata(&plat_device->dev);
+        struct arm_pmu *armpmu;
+        struct platform_device *plat_device;
+        struct arm_pmu_platdata *plat;
+        int ret;
+        u64 start_clock, finish_clock;
 
+        if (irq_is_percpu(irq))
+                dev = *(void **)dev;
+        armpmu = dev;
+        plat_device = armpmu->plat_device;
+        plat = dev_get_platdata(&plat_device->dev);
+
+        start_clock = sched_clock();
         if (plat && plat->handle_irq)
-                return plat->handle_irq(irq, dev, armpmu->handle_irq);
+                ret = plat->handle_irq(irq, dev, armpmu->handle_irq);
         else
-                return armpmu->handle_irq(irq, dev);
+                ret = armpmu->handle_irq(irq, dev);
+        finish_clock = sched_clock();
+
+        perf_sample_event_took(finish_clock - start_clock);
+        return ret;
 }
 
 static void