diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index cffffad01c31..fed53be44fd9 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
38 | #include <linux/tick.h> | 38 | #include <linux/tick.h> |
39 | #include <linux/kallsyms.h> | 39 | #include <linux/kallsyms.h> |
40 | #include <linux/perf_counter.h> | ||
40 | 41 | ||
41 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
42 | #include <asm/unistd.h> | 43 | #include <asm/unistd.h> |
@@ -1170,6 +1171,8 @@ static void run_timer_softirq(struct softirq_action *h) | |||
1170 | { | 1171 | { |
1171 | struct tvec_base *base = __get_cpu_var(tvec_bases); | 1172 | struct tvec_base *base = __get_cpu_var(tvec_bases); |
1172 | 1173 | ||
1174 | perf_counter_do_pending(); | ||
1175 | |||
1173 | hrtimer_run_pending(); | 1176 | hrtimer_run_pending(); |
1174 | 1177 | ||
1175 | if (time_after_eq(jiffies, base->timer_jiffies)) | 1178 | if (time_after_eq(jiffies, base->timer_jiffies)) |