path: root/kernel/time/timer.c
diff options
authorChristoph Lameter <>2014-08-17 12:30:25 -0500
committerTejun Heo <>2014-08-26 13:45:44 -0400
commit22127e93c587afa01e4f7225d2d1cf1d26ae7dfe (patch)
tree59e32c175bfe72758e44c1fe1215c13045c80b83 /kernel/time/timer.c
parentbb964a92ce70ac2039115edd019aa5eef8faa6bb (diff)
time: Replace __get_cpu_var uses
Convert uses of __get_cpu_var for creating a address from a percpu offset to this_cpu_ptr. The two cases where get_cpu_var is used to actually access a percpu variable are changed to use this_cpu_read/raw_cpu_read. Reviewed-by: Thomas Gleixner <> Signed-off-by: Christoph Lameter <> Signed-off-by: Tejun Heo <>
Diffstat (limited to 'kernel/time/timer.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index aca5dfe2fa3d..04d8ed8399b0 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -655,7 +655,7 @@ static inline void debug_assert_init(struct timer_list *timer)
static void do_init_timer(struct timer_list *timer, unsigned int flags,
const char *name, struct lock_class_key *key)
- struct tvec_base *base = __raw_get_cpu_var(tvec_bases);
+ struct tvec_base *base = raw_cpu_read(tvec_bases);
timer-> = NULL;
timer->base = (void *)((unsigned long)base | flags);