aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2010-11-30 15:05:53 -0500
committerThomas Gleixner <tglx@linutronix.de>2010-12-12 12:38:09 -0500
commit7496351ad87e61e96b49dd7b43c6534e3401f566 (patch)
treec04c0b191d9648dc2c3931a9ca5a48e851101d13 /kernel/timer.c
parent45f74264e18449cf3c93cccaf098ee6e9524ab78 (diff)
timers: Use this_cpu_read
Eric asked for this. [tglx: Because it generates faster code according to Erics ] Signed-off-by: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Tejun Heo <tj@kernel.org> Cc: linux-mm@kvack.org LKML-Reference: <alpine.DEB.2.00.1011301404490.4039@router.home> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c4
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 */
1228unsigned long get_next_timer_interrupt(unsigned long now) 1228unsigned 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 */
1268static void run_timer_softirq(struct softirq_action *h) 1268static 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