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 483e54ba5c93..beb97fd11ac2 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -1227,7 +1227,7 @@ static unsigned long cmp_next_hrtimer_event(unsigned long now, | |||
1227 | */ | 1227 | */ |
1228 | unsigned long get_next_timer_interrupt(unsigned long now) | 1228 | unsigned long get_next_timer_interrupt(unsigned long now) |
1229 | { | 1229 | { |
1230 | struct tvec_base *base = __get_cpu_var(tvec_bases); | 1230 | struct tvec_base *base = __this_cpu_read(tvec_bases); |
1231 | unsigned long expires; | 1231 | unsigned long expires; |
1232 | 1232 | ||
1233 | spin_lock(&base->lock); | 1233 | spin_lock(&base->lock); |
@@ -1267,7 +1267,7 @@ void update_process_times(int user_tick) | |||
1267 | */ | 1267 | */ |
1268 | static void run_timer_softirq(struct softirq_action *h) | 1268 | static void run_timer_softirq(struct softirq_action *h) |
1269 | { | 1269 | { |
1270 | struct tvec_base *base = __get_cpu_var(tvec_bases); | 1270 | struct tvec_base *base = __this_cpu_read(tvec_bases); |
1271 | 1271 | ||
1272 | hrtimer_run_pending(); | 1272 | hrtimer_run_pending(); |
1273 | 1273 | ||