aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2014-08-17 13:30:27 -0400
committerTejun Heo <tj@kernel.org>2014-08-26 13:45:45 -0400
commit4a32fea9d78f2d2315c0072757b197d5a304dc8b (patch)
tree6cb53d3bb67bed81671ff9ff38d2f48d118a2345 /kernel/time
parentdc5df73b3afffc8d042dadffc1c959008b2c1163 (diff)
scheduler: Replace __get_cpu_var with this_cpu_ptr
Convert all uses of __get_cpu_var for address calculation to use this_cpu_ptr instead. [Uses of __get_cpu_var with cpumask_var_t are no longer handled by this patch] Cc: Peter Zijlstra <peterz@infradead.org> Acked-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/tick-sched.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 73f90932282b..3cadc112519f 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -924,7 +924,7 @@ static void tick_nohz_account_idle_ticks(struct tick_sched *ts)
924 */ 924 */
925void tick_nohz_idle_exit(void) 925void tick_nohz_idle_exit(void)
926{ 926{
927 struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched); 927 struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
928 ktime_t now; 928 ktime_t now;
929 929
930 local_irq_disable(); 930 local_irq_disable();
@@ -1041,7 +1041,7 @@ static void tick_nohz_kick_tick(struct tick_sched *ts, ktime_t now)
1041 1041
1042static inline void tick_nohz_irq_enter(void) 1042static inline void tick_nohz_irq_enter(void)
1043{ 1043{
1044 struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched); 1044 struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
1045 ktime_t now; 1045 ktime_t now;
1046 1046
1047 if (!ts->idle_active && !ts->tick_stopped) 1047 if (!ts->idle_active && !ts->tick_stopped)