Merge branch 'linus' into perfcounters/core

[linux-2.6-block.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index cffffad01c31cf1670490f2860f0e5de0f25d301..fed53be44fd92179dd2291ca53dcfb3113591089 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -37,6 +37,7 @@
 #include <linux/delay.h>
 #include <linux/tick.h>
 #include <linux/kallsyms.h>
+#include <linux/perf_counter.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -1170,6 +1171,8 @@ static void run_timer_softirq(struct softirq_action *h)
 {
        struct tvec_base *base = __get_cpu_var(tvec_bases);
 
+       perf_counter_do_pending();
+
        hrtimer_run_pending();
 
        if (time_after_eq(jiffies, base->timer_jiffies))