diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index bbb51074680e..811e5c391456 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -37,7 +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 | #include <linux/perf_event.h> |
41 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
42 | 42 | ||
43 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
@@ -1187,7 +1187,7 @@ static void run_timer_softirq(struct softirq_action *h) | |||
1187 | { | 1187 | { |
1188 | struct tvec_base *base = __get_cpu_var(tvec_bases); | 1188 | struct tvec_base *base = __get_cpu_var(tvec_bases); |
1189 | 1189 | ||
1190 | perf_counter_do_pending(); | 1190 | perf_event_do_pending(); |
1191 | 1191 | ||
1192 | hrtimer_run_pending(); | 1192 | hrtimer_run_pending(); |
1193 | 1193 | ||